summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Convert CRLF newlines to LF when committing using the web editor.web-editor-autocrlfDouwe Maan2015-06-202-1/+7
|
* Merge branch 'new-mr-disable-change-target-branch' into 'master'Douwe Maan2015-06-202-6/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable changing of target branch in new merge request page when a branch has already been specified ### What does this MR do? This MR prevents a user from changing the target branch inside a new merge request page if the target branch has already been specified (e.g. from the shortcut in the activity feed). A link to "Change branches" is provided to allow the user to do this properly. ### Why was this MR needed? If a user attempted to create a merge request from a shortcut with a pre-specified target branch (e.g. `master`), the dropdown would suggest that the user could change the branch. However, this did not actually work due to duplicate data elements (see #1830 for more details), and the target branch would always be set to the original, default branch. This would lead to confusion, potentially causing an improper merge request to be created. ### What are the relevant issue numbers? Closes #1830 ### Screenshot ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/eeec4f5d4b66625a14be41e5ecbdc016/image.png) See merge request !846
| * Disable changing of target branch in new merge request page when a branch ↵Stan Hu2015-06-192-6/+8
| | | | | | | | | | | | has already been specified Closes #1830
* | Merge branch 'fix-error-500-internal-snippet' into 'master'Douwe Maan2015-06-206-2/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when one user attempts to access another's personal, internal snippet ### What does this MR do? This MR fixes an Error 500 that occurred if one user tried to access another's personal, internal snippet. Steps to reproduce: ### Why was this MR needed? 1. Go to `<hostname>/snippets/new`. 2. Select "Internal". 3. Create a snippet. Save the URL (e.g. `<hostname>/snippets/20`) 4. Logout and sign in as another user. 5. Go to the URL in step 3. ### What are the relevant issue numbers? Closes #1815 See merge request !854
| * | Fix Error 500 when one user attempts to access a personal, internal snippetStan Hu2015-06-196-2/+43
| |/ | | | | | | Closes #1815
* | Merge branch 'sshdoc' into 'master'Achilleas Pipinellis2015-06-201-1/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include non-default ssh key location info Fixes #875 Provide help for people who aren't SSH-clued by indicating how to point to key files that have been named something other than the default. A lot of people seem to assume that the filename they choose is irrelevant and then wonder why their private key is not being found by simple 'ssh' commands. See merge request !507
| * | Show username SSH config exampleJeff Blaine2015-06-191-3/+5
| | |
| * | Include non-default ssh key location infoJeff Blaine2015-06-191-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/875 Provide help for people who aren't SSH-clued by indicating how to point to key files that have been named something other than the default. A lot of people seem to assume that the filename they choose is irrelevant and then wonder why their private key is not being found by simple 'ssh' commands.
* | | Merge branch 'rs-blobview-js-refactor' into 'master'Robert Speicher2015-06-198-220/+311
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor and spec line highlighting Javascript - Replaces the fragile Spinach tests for this feature with Jasmine tests - The "Don't scroll the page when we click a line number" behavior now works as expected See merge request !820
| * | | Minor style fixes for LineHighlighterRobert Speicher2015-06-191-3/+3
| | | |
| * | | Refactor LineHighlighterrs-blobview-js-refactorRobert Speicher2015-06-192-82/+51
| | | |
| * | | Rename BlobView to LineHighlighterRobert Speicher2015-06-194-13/+13
| | | |
| * | | Remove "Multiselect Blob" feature specsRobert Speicher2015-06-192-143/+0
| | | | | | | | | | | | | | | | These are well covered by the new Jasmine tests, and faster!
| * | | Simplify line numberingRobert Speicher2015-06-191-1/+1
| | | |
| * | | Use `pushState` instead of the temporary div hackRobert Speicher2015-06-191-36/+10
| | | |
| * | | Refactor and spec BlobView JSRobert Speicher2015-06-194-74/+365
| | |/ | |/|
* | | Merge branch 'rs-dev-issue-2415' into 'master'Douwe Maan2015-06-1910-18/+81
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show user 2FA status on Admin::Users#show | Enabled | Disabled | | ------- | -------- | | ![Screen_Shot_2015-06-19_at_2.58.42_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b81f6a992366105c14e03852385b28f0/Screen_Shot_2015-06-19_at_2.58.42_PM.png) | ![Screen_Shot_2015-06-19_at_2.58.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7bb8fd11b6c27615eef19154ffabe2de/Screen_Shot_2015-06-19_at_2.58.30_PM.png) | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2415 See merge request !851
| * | Use User#two_factor_enabled instead of otp_required_for_loginrs-dev-issue-2415Robert Speicher2015-06-195-9/+9
| | |
| * | Add 2FA status to Admin::Users#showRobert Speicher2015-06-192-4/+32
| | |
| * | Add convenience methods to User for getting and setting 2FA statusRobert Speicher2015-06-193-1/+37
| | |
| * | Move the User dashboard enum further up in the classRobert Speicher2015-06-191-4/+3
|/ /
* | Merge branch 'update-rake-docs-for-omnibus-assets' into 'master'Jacob Vosmaer2015-06-192-4/+10
|\ \ | |/ |/| | | | | | | Update maintenance documentation to explain no need to recompile asssets for omnibus installations See merge request !847
| * Update maintenance documentation to explain no need to recompile asssets for ↵Stan Hu2015-06-192-4/+10
|/ | | | omnibus installations
* Merge branch 'revert-placeholder' into 'master'Dmitriy Zaporozhets2015-06-192-5/+24
|\ | | | | | | | | | | | | | | | | | | Revert "Changed the placeholder text and modified the css class to make it visible" This reverts commit c39c823421e9dfd3add4cb49a82fa32831797aa0. /cc @marin See merge request !845
| * Revert "Changed the placeholder text and modified the css class to make it ↵revert-placeholderDarby2015-06-182-5/+24
| | | | | | | | | | | | visible" This reverts commit c39c823421e9dfd3add4cb49a82fa32831797aa0.
* | Set build preparation script as executable.Marin Jankovski2015-06-191-0/+0
|/
* Merge branch 'add-test-for-project-search-results' into 'master'Hannes Rosenögger2015-06-181-0/+23
|\ | | | | | | | | | | | | | | Add init test for ProjectSearchResults Regression test for: https://github.com/gitlabhq/gitlabhq/pull/9368 See merge request !788
| * Add init test for ProjectSearchResultsStan Hu2015-06-181-0/+23
| | | | | | | | See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335
* | Merge branch 'build_script' into 'master'Dmitriy Zaporozhets2015-06-182-10/+28
|\ \ | |/ |/| | | | | | | | | | | | | Add a build preparation script, modify gitlab.ci.yml to use the script. Updated the .gitlab-ci.yml to use a script which contains build preparation for runners which might run docker images with CI runner. Regular builds should be not affected. See merge request !834
| * Use correct name for the script.build_scriptMarin Jankovski2015-06-181-1/+1
| |
| * Move prepare_build script to scripts dir.Marin Jankovski2015-06-182-1/+1
| |
| * Add a build preparation script, modify gitlab.ci.yml to use the script.Marin Jankovski2015-06-172-10/+28
| |
* | Merge branch 'fix-labels-permisssion-check' into 'master'Douwe Maan2015-06-184-7/+43
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix 403 Access Denied error messages when accessing Labels section in a project This would occur if the project's issues or merge requests features were disabled. The change in 9bcd36396b9 caused `can?(current_user, :read_merge_request, project)` to be false if the merge request feature were disabled, so `authorize_labels!` needs to be changed accordingly. Closes #1813 See merge request !836
| * | Fix 403 Access Denied error messages when accessing Labels section in a ↵Stan Hu2015-06-184-7/+43
| | | | | | | | | | | | | | | | | | project that has MRs disabled but issues enabled Closes #1813
* | | Merge branch 'fix/oauth_user_ldap_person' into 'master'Douwe Maan2015-06-182-50/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix behavior of ldap_person method in Gitlab::OAuth::User Code tweaks in 45e9150a caused the ldap_person method to not return expected results. Improved tests to cover the ldap_person method, which was previously stubbed. Restored the previous implementation of ldap_person, as I could not find a more concise to write it that still works with all the test cases. See merge request !837
| * | | Fix behavior of ldap_person method in Gitlab::OAuth::UserAlex Lossent2015-06-172-50/+61
| | | | | | | | | | | | | | | | | | | | Code tweaks in 45e9150a caused the ldap_person method to not return expected results. Improved tests to cover the ldap_person method, which was previously stubbed.
* | | | Merge branch 'link-to-rc-packages-in-tweet' into 'master'Sytse Sijbrandij2015-06-171-2/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | Add 'proposed tweet' for RC1 See merge request !835
| * | | Add 'proposed tweet' for RC1link-to-rc-packages-in-tweetJacob Vosmaer2015-06-171-2/+4
|/ / /
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-173-2/+29
|\ \ \
| * \ \ Merge branch 'swellard-issue-6123' into 'master'Dmitriy Zaporozhets2015-06-172-1/+24
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate 'Email has already been taken' message when creating a user devise :validatable and validates uniqueness set on the user email field cause 2 validations to fire when creating a new user with an email address already in use, Issue 6123 @stanhu Thanks for your input on merge request 807, I'll close that one in favour of this as I have added tests See merge request !817
| | * | | Fix duplicate 'Email has already been taken' message when creating a user, ↵swellard2015-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | updated comments
| | * | | Fix duplicate 'Email has already been taken' message when creating a userswellard2015-06-162-1/+24
| | | | |
| * | | | Merge branch 'rs-dev-issue-2373' into 'master'Dmitriy Zaporozhets2015-06-171-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org') https://dev.gitlab.org/gitlab/gitlabhq/issues/2373 See merge request !821
| | * | | | Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')rs-dev-issue-2373Robert Speicher2015-06-161-1/+5
| | | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-06-171-0/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'from_own_instance' into 'master'Job van der Voort2015-06-171-0/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added info about migrating to gitlab.com Added useful information. Because of tweet https://twitter.com/A_Makedonsky/status/610860840036749314 See merge request !1870
| | * | | | added info about migrating to gitlab.comKaren Carias2015-06-171-0/+3
| | | | | |
* | | | | | Merge branch 'placeholder_text'Dmitriy Zaporozhets2015-06-173-27/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: Gemfile.lock
| * | | | | Changed the placeholder text and modified the css class to make it visibleplaceholder_textDarby2015-06-163-24/+8
| | |/ / / | |/| | |
* | | | | Merge branch 'rs-rails-update' into 'master'Dmitriy Zaporozhets2015-06-172-34/+37
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump rails to 4.1.11, jquery-rails to 3.1.3 rails 4.1.11 notes - http://weblog.rubyonrails.org/2015/6/16/Rails-3-2-22-4-1-11-and-4-2-2-have-been-released-and-more/ jquery-rails < 3.1.3 security advisory: https://groups.google.com/forum/#!topic/ruby-security-ann/XIZPbobuwaY See merge request !830
View Lorry Controller Status