summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 44059-specify-variables-when-executing-a-manual-pi...Jose2018-04-30267-2151/+4350
|\
| * Merge branch '10-7-security_issue_42029' into 'security-10-7'Phil Hughes2018-04-301-1/+2
| * Merge branch 'security-45689-fix-archive-cache-bug' into 'security-10-7'Douwe Maan2018-04-301-2/+3
| * Merge branch 'ce-jej/branch-unprotection-disable-ui' into 'master'Grzegorz Bizon | OOO until May 7th2018-04-303-3/+3
| |\
| | * Backports EE changes from disabling branch unprotect UIJames Edwards-Jones2018-04-253-3/+3
| * | Merge branch '45481-sane-pages-artifacts' into 'master'Kamil Trzciński2018-04-301-18/+11
| |\ \
| | * | InvaildStateError -> InvalidStateErrorNick Thomas2018-04-271-9/+9
| | * | Don't automatically remove artifacts for pages jobs after pages:deploy has runNick Thomas2018-04-271-9/+2
| * | | Merge branch '45572-members-invitations-scheduled-before-commit' into 'master'Douwe Maan2018-04-302-6/+6
| |\ \ \
| | * | | Ensure member notifications are sent after the member actual creation/update ...Rémy Coutable2018-04-262-6/+6
| | | |/ | | |/|
| * | | Merge branch 'move-notification-service-calls-to-sidekiq' into 'master'Douwe Maan2018-04-3013-47/+83
| |\ \ \
| | * | | Move NotificationService calls to SidekiqSean McGivern2018-04-2513-47/+83
| * | | | Merge branch 'jramsay-44880-filter-pipelines-by-sha' into 'master'Kamil Trzciński2018-04-291-0/+9
| |\ \ \ \
| | * | | | Add sha filter to list pipelinesJames Ramsay2018-04-271-0/+9
| * | | | | Resolve "Add how to use nip.io to Auto DevOps and Kubernetes documentation"Dylan Griffith2018-04-271-0/+1
| * | | | | Merge branch 'jivl-revert-system-notes-can-be-confusing' into 'master'Nick Thomas2018-04-271-1/+1
| |\ \ \ \ \
| | * | | | | Remove comma from the time system notesJose2018-04-251-1/+1
| * | | | | | Merge branch 'qa-fix-protected-branches-test-ce' into 'master'Grzegorz Bizon2018-04-272-3/+3
| |\ \ \ \ \ \
| | * | | | | | Select everything so we could hit protectLin Jen-Shin2018-04-252-3/+3
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'ee-5514-fix-epic-collapsed-sidebar-label-click' into 'master'Filipa Lacerda2018-04-271-1/+1
| |\ \ \ \ \ \
| | * | | | | | Export class as defaultKushal Pandya2018-04-271-1/+1
| * | | | | | | Merge branch 'qa-add-more-key-tests' into 'master'Grzegorz Bizon2018-04-271-3/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master' into qa-add-more-key-testsLin Jen-Shin2018-04-2520-30/+87
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into qa-add-more-key-testsLin Jen-Shin2018-04-2460-732/+1306
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into qa-add-more-key-testsLin Jen-Shin2018-04-23184-1168/+2711
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Use qa selectors for secret variablesLin Jen-Shin2018-04-211-3/+3
| * | | | | | | | | | Clear refresh interval when MRWidgetFailedToMerge component is destroyedWinnie Hellmann2018-04-261-49/+53
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Reset milestone filter when clicking "Any Milestone" in dashboardWinnie Hellmann2018-04-261-28/+45
| * | | | | | | | | Merge branch 'pravi/gitlab-ce-remove-vendored-peek' into 'master'Sean McGivern2018-04-265-33/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | remove peek performance_barPirate Praveen2018-04-265-33/+0
| | | |_|_|_|/ / / / | | |/| | | | | | |
| * | | | | | | | | Fix calendar day positionClement Ho2018-04-261-2/+2
| * | | | | | | | | Merge branch 'restore-size-and-position-for-fork-icon' into 'master'Rémy Coutable2018-04-263-2/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Restore size and position for fork iconGeorge Tsiolis2018-04-183-2/+3
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceNick Thomas2018-04-2648-209/+325
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'ide-temp-file-folder-fixes' into 'master'Filipa Lacerda2018-04-2613-118/+176
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-2571-758/+1429
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | force modified icon in tree list & tab barPhil Hughes2018-04-253-2/+11
| | | * | | | | | | | | | Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-2348-257/+625
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | added line height to label in modalPhil Hughes2018-04-193-2/+6
| | | * | | | | | | | | | | fixed failing commit actions specPhil Hughes2018-04-191-8/+5
| | | * | | | | | | | | | | Merge branch 'master' into ide-temp-file-folder-fixesPhil Hughes2018-04-1969-554/+1330
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | added spec to new file dropdownPhil Hughes2018-04-191-46/+44
| | | * | | | | | | | | | | | fixed alignment of iconPhil Hughes2018-04-185-6/+32
| | | * | | | | | | | | | | | Fixed bugs with IDE new directoryPhil Hughes2018-04-189-67/+83
| | * | | | | | | | | | | | | Resolve "User deletion modal with same info for delete user / delete user and...schwedenmut2018-04-263-7/+6
| | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'zj-storage-path-deprecation' into 'master'Douwe Maan2018-04-2511-45/+45
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Gitlab::Shell works on shard name, not pathZeger-Jan van de Weg2018-04-2511-45/+45
| | * | | | | | | | | | | | | Merge branch '45398-fix-rss-button' into 'master'Tim Zallmann2018-04-251-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Remove relative positioning for tabs container to restore RSS buttonKushal Pandya2018-04-241-4/+0
| | * | | | | | | | | | | | | | Merge branch 'restore-label-underline-color' into 'master'Tim Zallmann2018-04-251-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | |