Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 20, 2015
  1. @tsigo
Commits on Jun 13, 2015
  1. @tsigo
  2. @tsigo
Commits on Jun 11, 2015
  1. @themaze75

    session_expire_seconds => session_expire_delay

    themaze75 authored Eric Maziade committed
    delay is in seconds
    more legible code in session_store
    Added `GitLab restart required` help block to session_expire_delay
Commits on Jun 5, 2015
  1. @novisoft
Commits on May 29, 2015
  1. @alexcern
  2. @DouweM

    Add option to disallow users from registering any application to use …

    DouweM authored
    …GitLab as an OAuth provider
Commits on May 22, 2015
  1. @stanhu

    Add support for Webhook note events

    stanhu authored
    Closes #6745
Commits on May 13, 2015
  1. @randx

    Merge branch 'version-check' into 'master'

    randx authored
    Version check
    
    See merge request !1509
Commits on May 12, 2015
  1. @randx

    Fix Gemfile.lock

    randx authored
  2. @randx

    Merge branch 'rs-system-note' into 'master'

    randx authored
    Add SystemNoteService class
    
    The Note model was basically two models crammed together - one handling user-created notes
    (i.e., comments on things) and one handling system-created notes (i.e., references).
    This splits out the system-specific stuff to a new SystemNoteService class.
    
    See merge request !595
Commits on May 11, 2015
  1. @tsigo
Commits on May 9, 2015
  1. @tsigo
Commits on May 8, 2015
  1. @randx

    Merge branch 'version-check' into gl-version-check

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    Conflicts:
    	app/controllers/admin/application_settings_controller.rb
    	app/views/admin/application_settings/_form.html.haml
    	db/schema.rb
Commits on May 5, 2015
  1. @randx

    Remove project dropdown and fix db sche,a

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Commits on May 2, 2015
  1. @stanhu

    Add application setting to restrict user signups to e-mail domains

    stanhu authored
    This feature was requested long ago:
    
    http://feedback.gitlab.com/forums/176466-general/suggestions/4118466-ability-to-register-only-from-ceratain-domains
    
    This MR is based off !253 but changed to use application settings and use wildcard strings
    to give more flexibility in pattern matching. Regexps seemed overkill and easy to get wrong.
    
    Only restrict e-mail addresses upon creation
Commits on Apr 30, 2015
  1. @DouweM

    Merge branch 'fix-project-tags' into 'master'

    DouweM authored
    Fix DB error when trying to tag a repository
    
    Steps to reproduce: Go to a project settings, add tags, click on save changes
    
    Observed behavior: Error 500
    
    ```
        PG::Error: ERROR:  column "taggings_count" does not exist
            LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun...
    ```
    
    Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first
    migration that created the `tags` and `taggings` table, and added the rest.
    
    * Closes #1512
    * Closes #1550
    * Closes #6867
    * Closes #9194
    
    See merge request !577
Commits on Apr 29, 2015
  1. @randx

    Merge branch 'search-layout' into 'master'

    randx authored
    Improvements to search layout
    
    Improve search layout to match new UI style and make it more mobile-firendly
    
    See merge request !585
  2. @vsizov

    Remove abandoned GroupMembers

    vsizov authored
Commits on Apr 28, 2015
  1. @randx

    Continue refactoring and restyle of search layout

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Commits on Apr 27, 2015
  1. @stanhu

    Fix DB error when trying to tag a repository

    stanhu authored
    Upon tagging a repository, an error due to a missing migration occurred:
    
    ```
        PG::Error: ERROR:  column "taggings_count" does not exist
            LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun...
    ```
    
    Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first
    migration that created the `tags` and `taggings` table, and added the rest.
    
    Closes #1512
    Closes #6867
    Closes #9194
Commits on Apr 26, 2015
  1. @mr-vinn

    Add new admin settings

    mr-vinn authored
    Add new global application settings for default project and snippet
    visibility levels.
Commits on Apr 24, 2015
  1. @DouweM

    Update schema.

    DouweM authored
Commits on Apr 20, 2015
  1. @jvanbaarsen

    Fixed the Rails/ActionFilter cop

    jvanbaarsen authored
    Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Commits on Apr 17, 2015
  1. @DouweM
Commits on Apr 15, 2015
  1. @randx

    Merge branch 'invitation' into 'master'

    randx authored
    Allow users to be invited.
    
    Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2058.
    
    The "Add members" panes for both Group Members and Project Members have gained a line of text by the People field.
    
    ![Screen_Shot_2015-04-10_at_14.14.32](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fe990e65eccd9203d7324b492941362b/Screen_Shot_2015-04-10_at_14.14.32.png)
    
    Entering an email address that is not already a member will give you the option to invite them.
    
    ![Screen_Shot_2015-04-10_at_14.14.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d6b0d4571ea90f2a2e4af8f5b336e8e1/Screen_Shot_2015-04-10_at_14.14.48.png)
    
    Choosing the option will add them to the People field. This works the right way (TM) in combination with adding existing users as members.
    
    ![Screen_Shot_2015-04-10_at_14.15.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a618e5ec292d79578b16400dca6d4cfe/Screen_Shot_2015-04-10_at_14.15.09.png)
    
    The invited member will be shown in the members list as such. The access level can be changed, and the invite can be revoked by deleting the member.
    
    ![Screen_Shot_2015-04-10_at_14.15.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3695b9a6778d367b275115747579b46e/Screen_Shot_2015-04-10_at_14.15.19.png)
    
    The invited user will receive an email with an "Accept invitation" link.
    
    ![Screen_Shot_2015-04-10_at_14.17.52](https://gitlab.com/gitlab-org/gitlab-ce/uploads/730121888153117d83c3cd0e4f5c90f6/Screen_Shot_2015-04-10_at_14.17.52.png)
    
    If they're not already logged in, clicking this link will redirect them to the sign in/up page with a helpful notice.
    
    ![Screen_Shot_2015-04-10_at_14.18.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1a26a5fa13321e7ef77ed8b538c8557d/Screen_Shot_2015-04-10_at_14.18.12.png)
    
    Signing in or signing up will redirect them back to the invite detail page, where they can actually accept the invitation, which will update the member record in question to point to the user in question.
    
    ![Screen_Shot_2015-04-10_at_14.18.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7ac33085463a99b8cfa6baa13bfa1235/Screen_Shot_2015-04-10_at_14.18.48.png)
    
    Accepting the invitation will redirect them to the group (or project) with an appropriate notice.
    
    ![Screen_Shot_2015-04-10_at_14.18.58](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bf02a2e3bea589a11df401c23e68648/Screen_Shot_2015-04-10_at_14.18.58.png)
    
    As currently, they will also receive this information by email.
    
    ![Screen_Shot_2015-04-10_at_14.24.00](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b44a342068433a268c0a06ed9e791ffa/Screen_Shot_2015-04-10_at_14.24.00.png)
    
    At the same time, the person who initially invited the email address is sent a notification as well, so they know of the new member and to tell them what name the user signed up with.
    
    ![Screen_Shot_2015-04-10_at_14.19.07](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b29fea128186f938ec76bd7dec016b83/Screen_Shot_2015-04-10_at_14.19.07.png)
    
    The member row on the Members page will now have been updated with the new user account.
    
    ![Screen_Shot_2015-04-10_at_14.19.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cf503d3d1679614e03acec2e946a28c3/Screen_Shot_2015-04-10_at_14.19.23.png)
    
    See merge request !500
  2. @DouweM

    Merge branch 'google-code-import' into 'master'

    DouweM authored
    Import projects from Google Code.
    
    Resolves #1257.
    
    Issue import logic almost entirely taken from https://gitlab.com/o9000/google-code-to-gitlab ( :hearts: @o9000).
    
    ### To do
    
    - [x] List projects from Google Takeout file
    - [x] Import Git repository
    - [x] Import issues
    - [x] Link to correct attachment URL (https://code.google.com/p/support-tools/issues/detail?id=50)
    - [x] Handle deleted attachments
    - [x] Handle blockedOn attribute
    - [x] Add directions on how to get data from Google Takeout
    
    ### Import instructions
    
    ![Screen_Shot_2015-04-03_at_16.02.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4a87038035fbad9441cf613b8cdcc690/Screen_Shot_2015-04-03_at_16.02.21.png)
    
    ### Imported issue
    
    ![Screen_Shot_2015-04-03_at_16.25.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b2c2eaf5ecfcf57b3c48511eb5d26db4/Screen_Shot_2015-04-03_at_16.25.49.png)
    
    See merge request !471
Commits on Apr 14, 2015
  1. @DouweM
  2. @Senorsen

    Allow user to choose which email to be public

    Senorsen authored
    This commit allows user to show one of their emails in profile page,
    or don't show email in this page.
  3. @DouweM

    Add invite data to member.

    DouweM authored
Commits on Apr 13, 2015
  1. @randx

    Merge branch 'ldap_migration'

    randx authored
    Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
    
    Conflicts:
    	db/schema.rb
  2. @randx

    Merge branch 'public-deploy-keys' into 'master'

    randx authored
    Allow admin to create public deploy keys that are accessible to any project.
    
    Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774.
    
    Project settings:
    
    ![Screen_Shot_2015-03-27_at_14.46.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01799ff912671ba6db3f828ea1aca1a6/Screen_Shot_2015-03-27_at_14.46.48.png)
    
    The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.
    
    The list of projects below the public key has been changed to only show projects the user has access to.
    
    "Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.
    
    Admin index:
    
    ![Screen_Shot_2015-03-27_at_14.47.06](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ea889d274cfd3f0694d47d602f4f3e94/Screen_Shot_2015-03-27_at_14.47.06.png)
    
    Admin detail page:
    
    ![Screen_Shot_2015-03-27_at_14.47.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8c8475e05bf6b497da3b9f1bc102329f/Screen_Shot_2015-03-27_at_14.47.16.png)
    
    Projects using the deploy key are listed on the left and can be disabled easily.
    
    See merge request !469
Commits on Apr 11, 2015
  1. @tsigo
  2. @vsizov

    fix ldap identities

    vsizov authored
Commits on Apr 3, 2015
  1. @DouweM
Something went wrong with that request. Please try again.