summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-todo-allow_collaboration' into 'master'Dmitriy Zaporozhets2019-07-031-0/+1
|\
| * Update TODO: allow_collaboration column renamingfix-todo-allow_collaborationMark Chao2019-07-031-0/+1
* | Merge branch 'issue/55953' into 'master'Sean McGivern2019-07-0314-35/+33
|\ \
| * \ Merge branch 'master' into michel.engelen/gitlab-ce-issue/55953Sean McGivern2019-07-0366-350/+919
| |\ \ | | |/
| * | replaced `discussion` with `thread` in comment buttonMichel Engelen2019-07-021-4/+4
| * | prettified noteable_discussion component and updated testsMichel Engelen2019-07-021-3/+1
| * | replaced string `discussion` with `thread` in issuable-form templateMichel Engelen2019-07-021-3/+3
| * | replaced string `discussion` wit `thread` in noteable-discussion componentMichel Engelen2019-07-021-6/+6
| * | replaced string `discussion` wit `thread` in comment-button templateMichel Engelen2019-07-021-2/+2
| * | replaced string `discussion` wit `thread` in discussion templateMichel Engelen2019-07-021-1/+1
| * | replaced string `discussion` wit `thread` in note-form componentMichel Engelen2019-07-021-2/+2
| * | replaced string `discussion` with string `thread` in mr-widget component stateMichel Engelen2019-07-021-1/+1
| * | replaced string `discussion` with string `thread` in thread headerMichel Engelen2019-07-022-2/+2
| * | renamed `discussion` to `thread` in popover from reply form buttonMichel Engelen2019-07-022-3/+3
| * | changed string `discussion` to `thread` in timeline update ("[user] resolved ...Michel Engelen2019-07-021-1/+1
| * | changed string `discussion` to `thread` in discussion (thread) counterMichel Engelen2019-07-021-3/+3
| * | changed string `discussion` to `thread` in reply formMichel Engelen2019-07-021-3/+3
| * | changed string `discussion` to `thread` in button and description titleMichel Engelen2019-07-021-2/+2
* | | Merge branch 'jc-deprecate-diverging-count-with-max' into 'master'Jan Provaznik2019-07-033-32/+1
|\ \ \
| * | | Deprecate diverging commit count with max parameterjc-deprecate-diverging-count-with-maxJohn Cai2019-07-023-32/+1
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2019-07-03198-895/+2148
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'sh-improve-redis-peek' into 'master'Sean McGivern2019-07-032-42/+6
| |\ \ \
| | * | | Add Redis call details in Peek performance barsh-improve-redis-peekStan Hu2019-07-022-42/+6
| * | | | Show upcoming status for releasesJason Goodman2019-07-034-5/+18
| * | | | Rebased and squashed commitsNatalia Tepluhina2019-07-0318-127/+392
| * | | | Replace slugifyWithHyphens with improved slugify functionLuke Ward2019-07-033-6/+13
| * | | | Merge branch 'rj-fix-manual-order' into 'master'Kushal Pandya2019-07-031-1/+1
| |\ \ \ \
| | * | | | Don't let logged out user do manual orderrj-fix-manual-orderRajat Jain2019-07-021-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'vue-i18n-js-ide-directory' into 'master'Tim Zallmann2019-07-035-14/+22
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Vue-i18n: app/assets/javascripts/ide directoryvue-i18n-js-ide-directoryEzekiel Kigbo2019-07-015-14/+22
| * | | | Fix typo in updateResolvableDiscussionsCounts actionWinnie Hellmann2019-07-022-7/+7
| * | | | Add username to deploy tokensKrasimir Angelov2019-07-024-3/+22
| | |/ / | |/| |
| * | | Merge branch '12534-clusters' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ \
| | * | | Backports css class used in EE specs12534-clustersFilipa Lacerda2019-07-021-1/+1
| * | | | Merge branch '12537-settings-general' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ \ \
| | * | | | Removes EE differences12537-settings-generalFilipa Lacerda2019-07-021-1/+1
| | |/ / /
| * | | | Merge branch '63690-issue-trackers-title' into 'master'Dmitriy Zaporozhets2019-07-028-66/+66
| |\ \ \ \
| | * | | | Use title and description fields for issue trackers63690-issue-trackers-titleJarka Košanová2019-07-028-66/+66
| * | | | | Includes logic to persist namespace statisticsMayra Cabrera2019-07-029-2/+213
| * | | | | Registry component now includes error messagesNick Kipling2019-07-026-60/+145
| * | | | | Enables ingress for uninstallationJoão Cunha2019-07-023-15/+12
| | |_|_|/ | |/| | |
| * | | | Allow adding new entries to existing pathDenys Mishunov2019-07-027-4/+29
| * | | | Merge branch '12532-services-form' into 'master'Phil Hughes2019-07-021-1/+1
| |\ \ \ \
| | * | | | Removes EE differences12532-services-formFilipa Lacerda2019-07-011-1/+1
| * | | | | Merge branch 'sh-add-thread-memory-cache' into 'master'Rémy Coutable2019-07-025-8/+27
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Use an uncached application setting for usage ping checksStan Hu2019-07-021-2/+9
| | * | | | Fix broken specs due to cached application settingsStan Hu2019-07-012-3/+3
| | * | | | Add a memory cache local to the thread to reduce Redis loadStan Hu2019-07-012-3/+15
| * | | | | Memoizing root_ancestor in NamespaceAdam Hegyi2019-07-021-1/+3
| * | | | | QA: transfer project specJennifer Louie2019-07-025-7/+7
View Lorry Controller Status