| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| | |
|
| | |
|
| |
|
|
| |
These are well covered by the new Jasmine tests, and faster!
|
| | |
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Revert "Changed the placeholder text and modified the css class to make it visible"
This reverts commit c39c823421e9dfd3add4cb49a82fa32831797aa0.
/cc @marin
See merge request !845
|
| | |
| |
| |
| |
| |
| | |
visible"
This reverts commit c39c823421e9dfd3add4cb49a82fa32831797aa0.
|
| |/ |
|
| |\
| |
| |
| |
| |
| |
| |
| | |
Add init test for ProjectSearchResults
Regression test for: https://github.com/gitlabhq/gitlabhq/pull/9368
See merge request !788
|
| | |
| |
| |
| | |
See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | | |
| | |
| | |
| | |
| | |
| | | |
project that has MRs disabled but issues enabled
Closes #1813
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | | |
Add 'proposed tweet' for RC1
See merge request !835
|
| |/ / / |
|
| |\ \ \ |
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | |
| | | | |
| | | | |
| | | | | |
updated comments
|
| | | | | | |
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Prefix 2FA issuer with the GitLab host (e.g., 'dev.gitlab.org')
https://dev.gitlab.org/gitlab/gitlabhq/issues/2373
See merge request !821
|
| | | | | | | |
|
| |\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| | |\ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
added info about migrating to gitlab.com
Added useful information. Because of tweet https://twitter.com/A_Makedonsky/status/610860840036749314
See merge request !1870
|
| | | | | | | |
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
Gemfile.lock
|
| | | |/ / /
| |/| | | |
|
| |\ \ \ \ \
| |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | | | |
|
| |/ / / / |
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | | |
Random Bootlint fixes
See merge request !822
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| |/ / / |
|
| |\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Support commenting on a diff in side-by-side view
### What does this MR do?
This MR adds support for commenting on a diff in side-by-side (aka parallel) view. It also fixes a JavaScript bug (see !779) when the comment button is clicked on a line that already has a comment.
There is an existing bug where the comment count is not updated when a new comment is added. I'll send a MR for that later.
### Why was this MR needed?
Commenting only worked in "inline" mode. Often the side-by-side view is more conducive to writing comments.
### What are the relevant issue numbers?
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
### Screenshot
See merge request !810
|
| | | |
| | |
| | |
| | | |
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
|
| |\ \ \ |
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If kerberos is enabled require it
Since 'group: :kerberos' got [included in the Gemfile ](https://gitlab.com/gitlab-org/gitlab-ce/commit/2391a43a7073b4e723e9ca1f7ff19b30f8e51452) Kerberos no longer got [loaded when the app started](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/application.rb#L6)
This caused `Devise::OmniAuth::StrategyNotFound` error once Kerberos is enabled, failing to start GitLab .
With this we hopefully do not need to remove group from the Gemfile.
See merge request !819
|
| | | | | |
|
| | | | | |
|
| |\ \ \ \
| |/ / / |
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix hooks for web based events with external issue references
The creation of cross references for external issues (which would fail)
is now prevented. This fixes a 500 error and the execution of hooks when
creating a merge request or commenting on one.
Fixes #1650, GH-9333.
This regression might have been introduced by
8f8a8ab32bca8fdc79d7a5115eabbd015dd44c02. There is actually a TODO by
@rspeicher mentioning external issues which is lost (unhandled) in a
later commit.
This fix is related to !766 and !804 which fix a similar issue for hooks for
Git based events.
See merge request !794
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The creation of cross references for external issues (which would fail)
is now prevented.
Fixes #1650, GH-9333.
|
| |\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fix layout issue in header title truncation.
@douwe Thanks for reviewing this fix for the issue mentioned in https://dev.gitlab.org/gitlab/gitlabhq/issues/2314#note_48539.
**BEFORE**
**AFTER**
See merge request !1867
|
