summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge branch ↵Kushal Pandya2019-05-164-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-size' into 'master' CE Fix flyout nav on small viewports See merge request gitlab-org/gitlab-ce!25998
| * | | | | | | | | | | | | Fix flyout nav on small viewportsce-quick-fix-58727-collapsed-sidebar-flyout-menu-items-don-t-appear-in-1200px-screen-sizeLuke Bennett2019-05-154-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouples sidebar collapsed style from behavior.
* | | | | | | | | | | | | | Merge branch 'jej/list-sessions-for-user' into 'master'Stan Hu2019-05-162-11/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sessions can be listed for a given user See merge request gitlab-org/gitlab-ce!28306
| * | | | | | | | | | | | | | Sessions can be listed for a given userjej/list-sessions-for-userJames Edwards-Jones2019-05-152-11/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds ActiveSession#session_ids_for_user for listing session IDs for a given user, and adds ActiveSession#list_sessions for listing session data directly.
* | | | | | | | | | | | | | | Merge branch 'winh-karma-chrome-keychain' into 'master'Stan Hu2019-05-151-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress keychain access popup from chromedriver in Karma See merge request gitlab-org/gitlab-ce!28310
| * | | | | | | | | | | | | | | Suppress keychain access popup from chromedriver in KarmaWinnie Hellmann2019-05-151-0/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge branch 'patch-55' into 'master'Clement Ho2019-05-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: couple of improvements to the Vuex frontend guide See merge request gitlab-org/gitlab-ce!28257
| * | | | | | | | | | | | | | | Couple of improvements to the Vuex frontend guidePhillip Johnsen2019-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two nitpick improvements to the following: * set `state.isAddingUser = false` when request resulted in an error, as it has finished after all * be very explicit about vuex store being a local module to avoid confusion about a dependency named `store`
* | | | | | | | | | | | | | | | Merge branch 'patch-37' into 'master'Evan Read2019-05-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mysql.md: variables values should be quoted, otherwise you get an... See merge request gitlab-org/gitlab-ce!24214
| * | | | | | | | | | | | | | | | Update mysql.md: variables values should be quoted, otherwise you get an ↵Jean2019-05-151-2/+2
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "variables config should be a hash of key value pairs" error
* | | | | | | | | | | | | | | | Merge branch 'master' into 'master'Evan Read2019-05-151-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CI doc] Add chat value to only keyword See merge request gitlab-org/gitlab-ce!27417
| * | | | | | | | | | | | | | | | [CI doc] Add chat value to only keywordBAI Peng2019-05-151-0/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge branch 'patch-34' into 'master'Evan Read2019-05-151-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recursive/nested includes supported now See merge request gitlab-org/gitlab-ce!28155
| * | | | | | | | | | | | | | | | recursive/nested includes supported nowBen Bodenmiller2019-05-061-3/+0
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'patch-54' into 'master'Evan Read2019-05-151-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upgrate example ymal file, change type to stage. See merge request gitlab-org/gitlab-ce!27992
| * | | | | | | | | | | | | | | | | upgrate example ymal file, change type to stage.mouson2019-05-021-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update test-and-deploy-python-application-to-heroku.md
* | | | | | | | | | | | | | | | | | Merge branch 'docs-component-cleanup' into 'master'Achilleas Pipinellis2019-05-151-41/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: improve architecture component details See merge request gitlab-org/gitlab-ce!28280
| * | | | | | | | | | | | | | | | | | docs: improve architecture component detailsBen Bodenmiller2019-05-151-41/+43
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'docs-update-group-template-pricing-tier' into 'master'Evan Read2019-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add premium & silver badge to group project templates docs Closes gitlab-ee#11587 See merge request gitlab-org/gitlab-ce!28304
| * | | | | | | | | | | | | | | | | | Update group project templates to premium/silverdocs-update-group-template-pricing-tierTristan Williams2019-05-141-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'docs-correct-security-anchor-ee' into 'master'Achilleas Pipinellis2019-05-152-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: update link to new security docs See merge request gitlab-org/gitlab-ce!28299
| * | | | | | | | | | | | | | | | | | | Update links to new security docsdocs-correct-security-anchor-eeMark Chao2019-05-132-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related to gitlab-ee/!5566
* | | | | | | | | | | | | | | | | | | | Merge branch 'patch-57' into 'master'Achilleas Pipinellis2019-05-151-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs: use sudo on gitlab-rake gitlab:features:* See merge request gitlab-org/gitlab-ce!28288
| * | | | | | | | | | | | | | | | | | | | docs: use sudo on gitlab-rake gitlab:features:*Ben Bodenmiller2019-05-151-3/+2
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge branch 'patch-58' into 'master'Evan Read2019-05-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo mentioning SAST instead of DAST See merge request gitlab-org/gitlab-ce!28308
| * | | | | | | | | | | | | | | | | | | | 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.