summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | fix a typo of sastQuantum Operations2019-05-141-1/+1
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'elasticsearch-pathfix-docs' into 'master'Achilleas Pipinellis2019-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ES indexer install script - remove leading / See merge request gitlab-org/gitlab-ce!28231
| * | | | | | | | | | | | | | | | Fix ES indexer install script - remove leading /elasticsearch-pathfix-docsGreg Myers2019-05-101-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-58' into 'master'Evan Read2019-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in index.md See merge request gitlab-org/gitlab-ce!28311
| * | | | | | | | | | | | | | | | Fix typo in index.mdJonas Gollenz2019-05-141-1/+1
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'patch-55' into 'master'Achilleas Pipinellis2019-05-151-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the unnecessary line. It would be covered anyway by line 352... See merge request gitlab-org/gitlab-ce!28228
| * | | | | | | | | | | | | | | | Removed the unnecessary line. It would be covered anyway by line 352 ↵bardia zamanian2019-05-091-1/+0
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (replicas=$(get_replicas "$track" "$percentage")
* | | | | | | | | | | | | | | | Merge branch 'rjh/doc-fixes-for-source-install' into 'master'Evan Read2019-05-152-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rjh/doc fixes for source install See merge request gitlab-org/gitlab-ce!27916
| * | | | | | | | | | | | | | | | Rjh/doc fixes for source installRichard Hancock2019-05-152-9/+9
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'doc-jej/session-stored-globaly' into 'master'Evan Read2019-05-152-0/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds developer documentation for accessing session data in GitLab See merge request gitlab-org/gitlab-ce!27996
| * | | | | | | | | | | | | | | Document ways of accessing Session data in GitLabdoc-jej/session-stored-globalyJames Edwards-Jones2019-05-152-0/+66
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'js-i18n-m' into 'master'60916-list-vanilla-js-i18n-offences-which-were-not-auto-fixedKushal Pandya2019-05-156-13/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n JS files starting with m See merge request gitlab-org/gitlab-ce!28068
| * | | | | | | | | | | | | | | | I18N JS files starting with mjs-i18n-mBrandon Labuschagne2019-05-036-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. This commit only targets Vanilla JS files. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html
* | | | | | | | | | | | | | | | | Merge branch 'ce-jej/sso-enforcement-redirect' into 'master'Rémy Coutable2019-05-158-22/+181
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor RoutableActions to allow additional not_found checks See merge request gitlab-org/gitlab-ce!28243
| * | | | | | | | | | | | | | | | | Avoid passing not_found_or_authorized_proc aroundJames Edwards-Jones2019-05-158-22/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this needs to be called on every find_routable!(Project, ... we can instead move it to a RoutableActions check.
| * | | | | | | | | | | | | | | | | Refactor RoutableActions to allow for additional checksJames Edwards-Jones2019-05-151-3/+9
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Added RoutableActions testsJames Edwards-Jones2019-05-151-0/+119
| | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'new-proj-member-scb' into 'master'Phil Hughes2019-05-153-1/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in new proj member import See merge request gitlab-org/gitlab-ce!28254
| * | | | | | | | | | | | | | | | | Resolve CE/EE diffs in new proj member importnew-proj-member-scbLuke Bennett2019-05-103-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | Merge branch 'proj-branches-index-scb' into 'master'Phil Hughes2019-05-151-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in project branches See merge request gitlab-org/gitlab-ce!28261
| * | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in project branchesproj-branches-index-scbLuke Bennett2019-05-111-0/+3
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | Merge branch 'layouts-scb' into 'master'Phil Hughes2019-05-1516-4/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in app/views/layouts view Closes gitlab-ee#6647 See merge request gitlab-org/gitlab-ce!28197
| * | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in app/views/layouts viewlayouts-scbLuke Bennett2019-05-1116-4/+52
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | Merge branch 'health-check-scb' into 'master'Phil Hughes2019-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in health check See merge request gitlab-org/gitlab-ce!28270
| * | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in health checkhealth-check-scbLuke Bennett2019-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | | Merge branch '57239-remove-unused-h3-w3-classes' into 'master'Phil Hughes2019-05-151-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused h-3 and w-3 classes Closes #57239 See merge request gitlab-org/gitlab-ce!28297
| * | | | | | | | | | | | | | | | | | | Remove unused h-3 and w-3 classes57239-remove-unused-h3-w3-classesPaul Slaughter2019-05-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were introduced in [this mr][1], with the intention of using the. Appaarently the usage was removed during review, but the new classes accidentally stayed around. [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24724
* | | | | | | | | | | | | | | | | | | | Merge branch 'clone-panel-scb' into 'master'Phil Hughes2019-05-151-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in _clone_panel See merge request gitlab-org/gitlab-ce!28309
| * | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in _clone_panelclone-panel-scbLuke Bennett2019-05-141-0/+5
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | | | Merge branch 'zero-auth-proj-scb' into 'master'Phil Hughes2019-05-153-5/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in zero_authorized_projects See merge request gitlab-org/gitlab-ce!28260
| * | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in zero_authorized_projectszero-auth-proj-scbLuke Bennett2019-05-113-5/+20
| | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | | | Merge branch 'tabs-ldap-scb' into 'master'Phil Hughes2019-05-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in devise ldap tabs See merge request gitlab-org/gitlab-ce!28252
| * | | | | | | | | | | | | | | | | | | | Resolve CE/EE diffs in devise ldap tabstabs-ldap-scbLuke Bennett2019-05-101-0/+1
| | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of single codebase changes.
* | | | | | | | | | | | | | | | | | | | Merge branch 'next-badge-link' into 'master'Kushal Pandya2019-05-152-2/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to next badge Closes #61503 See merge request gitlab-org/gitlab-ce!28162
| * | | | | | | | | | | | | | | | | | | Remove trailing whitespace for lintnext-badge-linkMarcel van Remmerden2019-05-131-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Finish rebase processMarcel van Remmerden2019-05-131-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Resolve merge conflictMarcel van Remmerden2019-05-071-3/+4
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Change sizes from px to variablesMarcel van Remmerden2019-05-071-4/+4
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Refactor badge with link layoutMarcel van Remmerden2019-05-072-22/+18
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Adapt code to style guidelinesMarcel van Remmerden2019-05-072-9/+9
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Remove trailing whitespacesMarcel van Remmerden2019-05-071-4/+3
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Remove whitespaceMarcel van Remmerden2019-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Fix new linesMarcel van Remmerden2019-05-071-1/+7
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-072-2/+18
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add badge link and adapt visual style to badges Marcel van Remmerden2019-05-131-3/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'bvl-add-corrilation-id-to-all-exception' into 'master'Douglas Barbosa Alexandre2019-05-143-10/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add correlation id to all sentry errors Closes #61699 See merge request gitlab-org/gitlab-ce!28253
| * | | | | | | | | | | | | | | | | | | | Add correlation id to all sentry errorsBob Van Landuyt2019-05-133-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this, we were only adding the correlation id to the "acceptable exceptions" which we handle in code. But we need to add it to the default raven context so the information would be available for uncaught exceptions.
* | | | | | | | | | | | | | | | | | | | | Merge branch 'patch-56' into 'master'Evan Read2019-05-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo See merge request gitlab-org/gitlab-ce!28276
| * | | | | | | | | | | | | | | | | | | | | Fix typoNicholas Bishop2019-05-141-1/+1
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'53811-move-multiple-issue-boards-for-projects-to-coreStan Hu2019-05-1410-7/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise upload path calls See merge request gitlab-org/gitlab-ce!28264