summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Style people in issuable search bar (!11402)winh-styled-people-search-barwinh2017-06-0210-22/+237
|
* Move clear search button out of issuable search barwinh2017-06-022-3/+3
|
* Add frontend fixture for issue listwinh2017-06-021-0/+11
|
* Simplify filtered_search_visual_tokens_spec.jswinh2017-06-021-118/+163
|
* Merge branch '33207-show-delete-option-in-admin-users-page' into 'master'Grzegorz Bizon2017-06-023-1/+7
|\ | | | | | | | | | | | | Allow admins to delete users from the admin users page Closes #33207 See merge request !11852
| * Allow admins to delete users from the admin users pageNick Thomas2017-06-013-1/+7
| |
* | Merge branch 'update-shell-5-0-5' into 'master'Sean McGivern2017-06-021-1/+1
|\ \ | | | | | | | | | | | | Update GITLAB_SHELL_VERSION See merge request !11835
| * | Update GITLAB_SHELL_VERSIONupdate-shell-5-0-5Alejandro Rodríguez2017-05-311-1/+1
| | | | | | | | | | | | | | | This change continues with the plan to change the parameters passed around GitLab components to allow for independence of mount points. See https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/130#note_28747613
* | | Merge branch '32538-url' into 'master'Tim Zallmann2017-06-021-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fix IE11 error from sentry Closes #32538 See merge request !11586
| * | | fix IE11 error from sentry32538-urlSimon Knox2017-05-191-1/+2
| | | |
* | | | Merge branch 'winh-current-user-filter' into 'master'Phil Hughes2017-06-0211-22/+266
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show current user immediately in issuable filters Closes #22921 See merge request !11630
| * | | | Show current user immediately in issuable filtersWinnie Hellmann2017-06-0211-22/+266
|/ / / /
* | | | Merge branch 'add-new-rake-task-for-gettext' into 'master'Douwe Maan2017-06-012-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add new Rake task to simplify the compilation of PO files See merge request !11864
| * | | | Add new Rake task to simplify the compilation of PO filesadd-new-rake-task-for-gettextRuben Davila2017-06-012-2/+9
| | | | |
* | | | | Merge branch 'bvl-move-gitlab-git-encodinghelper' into 'master'Robert Speicher2017-06-0112-75/+73
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper` See merge request !11772
| * | | | | Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`Bob Van Landuyt2017-06-0112-75/+73
|/ / / / /
* | | | | Merge branch 'zj-realtime-env-list' into 'master'Kamil Trzciński2017-06-0115-57/+259
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Realtime env list Closes #31701 See merge request !11333
| * | | | | Explicitly test etag cache invalidationzj-realtime-env-listZ.J. van de Weg2017-06-011-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a new deployment is created, this will trigger the invalidation on the etag cache on the environment. This flow is now explicitly tested.
| * | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-06-01657-4449/+12690
| |\ \ \ \ \
| * | | | | | Test etag cache key changing valueZ.J. van de Weg2017-05-312-2/+19
| | | | | | |
| * | | | | | Merge branch 'master' into zj-realtime-env-listZ.J. van de Weg2017-05-25347-1874/+3466
| |\ \ \ \ \ \
| * | | | | | | Restore original comment [ci skip]Z.J. van de Weg2017-05-241-1/+1
| | | | | | | |
| * | | | | | | Test etag caching router and incorporate reviewZ.J. van de Weg2017-05-245-6/+25
| | | | | | | |
| * | | | | | | emptyZ.J. van de Weg2017-05-220-0/+0
| | | | | | | |
| * | | | | | | Remove commented codeZ.J. van de Weg2017-05-220-0/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Guarantees first request is made even when the tab is not visibleFilipa Lacerda2017-05-182-0/+4
| | | | | | | | |
| | * | | | | | | Creates mixin to hold data common to both environments appsFilipa Lacerda2017-05-153-24/+30
| | | | | | | | |
| | * | | | | | | Remove commented codeFilipa Lacerda2017-05-142-3/+0
| | | | | | | | |
| | * | | | | | | Adds polling function to environments tableFilipa Lacerda2017-05-148-53/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds polling function to folder table Adds missing eventhub to folder table
| | * | | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-124-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the index view, the environments can now be requested every 15 seconds. Any transition state of a projects environments will trigger a cache invalidation action. Fixes gitlab-org/gitlab-ce#31701
| * | | | | | | | Adds polling function to environments tableFilipa Lacerda2017-05-226-55/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds missing eventhub to folder table
| * | | | | | | | Use etag caching for environments JSONZ.J. van de Weg2017-05-226-3/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the index view, the environments can now be requested every 15 seconds. Any transition state of a projects environments will trigger a cache invalidation action. Fixes gitlab-org/gitlab-ce#31701
* | | | | | | | | Merge branch 'dm-fix-pipeline-creation-race-condition' into 'master'Kamil Trzciński2017-06-013-14/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race condition between pipeline creation and MR diff_head_sha update Closes #33219 See merge request !11859
| * | | | | | | | Fix race condition between pipeline creation and MR diff_head_sha updateDouwe Maan2017-06-013-14/+9
| | | | | | | | |
* | | | | | | | | Merge branch '32985-show-more-notes-info-at-smaller-breakpoints' into 'master'Annabel Dunstone Gray2017-06-011-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Maintain notes avatar at smaller breakpoint Closes #32985 See merge request !11841
| * | | | | | | | | Maintain notes avatar at smaller breakpoint32985-show-more-notes-info-at-smaller-breakpointsEric Eastwood2017-06-011-2/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32985
* | | | | | | | | Merge branch 'yuanfeiz/gitlab-ce-aliyun-backup-provider' into 'master'Rémy Coutable2017-06-014-1/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add fog-aliyun as backup storage provider See merge request !11849
| * | | | | | | | | Add fog-aliyun as backup storage provideryuanfeiz/gitlab-ce-aliyun-backup-providerYuanfei Zhu2017-06-014-1/+12
| | | | | | | | | |
* | | | | | | | | | Merge branch 'dm-gravatar-username' into 'master'Sean McGivern2017-06-016-12/+41
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add username parameter to gravatar URL Closes #24472 See merge request !11741
| * | | | | | | | | | Add username parameter to gravatar URLDouwe Maan2017-06-016-12/+41
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '24196-protected-variables' into 'master'Kamil Trzciński2017-06-0123-43/+342
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementation for protected variables Closes #24196 See merge request !11688
| * | | | | | | | | | | Make sure protected can't be null; Test protected!24196-protected-variablesLin Jen-Shin2017-06-012-4/+26
| | | | | | | | | | | |
| * | | | | | | | | | | Just mention which GitLab version is requiredLin Jen-Shin2017-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11688/diffs#note_31277454
| * | | | | | | | | | | Merge two items into one in the docLin Jen-Shin2017-06-011-2/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into '24196-protected-variables'Kamil Trzciński2017-06-0150-57/+647
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | | | | | | | Add test for Project#protected_for?Lin Jen-Shin2017-06-011-0/+37
| | | | | | | | | | | |
| * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into 24196-protected-variablesLin Jen-Shin2017-06-01176-831/+3766
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (141 commits) Add Documentation for GIT_CHECKOUT variable Ui improvements for count badges and permission badges Rename the other jobs Update jobs_spec for changes from builds_spec Update docs related to protected actions Add changelog for protected branches abilities fix Ask for an example project for bug reports Center loading spinner in issuable filters Fix chat commands specs related to protected actions Fix builds controller specs related to protected actions Fix pipeline retry specs related to protected actions Fix environment model specs related to protected actions Fix build factory specs related to protected actions Fix job play service specs related to protected actions Fix play status specs related to protected actions Fix deploy chat command specs for protected actions Fix environment specs related to protected actions Use another scope to add the - prefix, feedback: Fix pipeline processing specs related to protected actions Fix build entity specs related to protected actions ...
| * | | | | | | | | | | | Make sure we're loading the fresh variablesLin Jen-Shin2017-06-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11688#note_31186872
| * | | | | | | | | | | | Now secret_variables_for would return the variablesLin Jen-Shin2017-06-011-3/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix doc table of contentsLin Jen-Shin2017-05-311-1/+1
| | | | | | | | | | | | |
View Lorry Controller Status