- 16 Dec, 2016 3 commits
-
-
Timothy Andrew authored
-
Timothy Andrew authored
-
Rémy Coutable authored
The issue was arising when `#current_user` was called a second time after a user was impersonated: the `User#is_admin?` check would be performed on it and it would fail. Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 15 Dec, 2016 8 commits
-
-
Fatih Acet authored
Adds hoverstates for collapsed Issue/Merge Request sidebar for Time tracking Icon This MR is part 2/2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/25011 This adds the hover state for the time tracking icon, which is only in EE. ![2016-11-28_00.09.54](/uploads/a1ae70e10ad847c4980fa9eca3dcfe18/2016-11-28_00.09.54.gif) Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25011 See merge request !918
-
Sean McGivern authored
Add user activities API Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/1311 See merge request !962
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
- 14 Dec, 2016 14 commits
-
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
James Lopez authored
-
Chris Wilson authored
Include information on updating mirror synchronization times + update_all_mirrors_worker_cron + update_all_remote_mirrors_worker_cron See merge request !763
-
- 13 Dec, 2016 3 commits
-
-
Achilleas Pipinellis authored
-
Douglas Barbosa Alexandre authored
Document a new gotcha when using `prepend` See merge request !963
-
Rémy Coutable authored
[ci skip] Signed-off-by: Rémy Coutable <remy@rymai.me>
-
- 12 Dec, 2016 12 commits
-
-
Douglas Barbosa Alexandre authored
CE upstream Unmerged paths: (use "git add/rm ..." as appropriate to mark resolution) ``` both modified: app/models/namespace.rb both modified: app/models/project.rb both modified: app/views/layouts/nav/_group_settings.html.haml both modified: app/views/projects/_merge_request_settings.html.haml both modified: app/views/projects/edit.html.haml both modified: app/views/shared/milestones/_summary.html.haml both modified: db/schema.rb both modified: doc/README.md both modified: doc/api/merge_requests.md both modified: lib/api/merge_requests.rb both modified: lib/gitlab/search_results.rb both modified: spec/lib/gitlab/import_export/all_models.yml both modified: spec/models/project_spec.rb both modified: spec/services/merge_requests/refresh_service_spec.rb ``` See merge request !960
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Douglas Barbosa Alexandre authored
-
Rémy Coutable authored
API: Add the project filter to the groups endpoint. Related to #22928. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25420 See merge request !8034
-
Sean McGivern authored
Allow branch names with dots on API endpoint closes #25030 See merge request !7963
-
Robert Schilling authored
-
Sean McGivern authored
fix: 25294 - remove signed_out notification Closes #25294 See merge request !7958
-
Fatih Acet authored
Fix alignment for notification settings ajax response ## What does this MR do? Fixes a issue where an AJAX call to change your global notification settings will return an html partial which has the incorrect dropdown alignment class, in some cases causing the dropdown menu to become obscured on the left side of the screen. ## Are there points in the code the reviewer needs to double check? ## Screenshots (if relevant) See issue #25510 for a screenshot of the problem and steps to reproduce. ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [ ] ~~Added for this feature/bug~~ - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25510 See merge request !8024
-
jnoortheen authored
test: replaced signed_out message check with check for sign_in button fixes #25294
-