summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/gb/manual-actions-protected-branches-permissions' into ...Kamil Trzciński2017-05-0610-28/+36
|\
| * Refine inheritance model of extended CI/CD statusesGrzegorz Bizon2017-05-059-32/+16
| * Introduce generic manual action extended status classGrzegorz Bizon2017-05-053-6/+26
| * Use update build policy instead of new play policyGrzegorz Bizon2017-05-051-1/+1
| * Merge commit '3a2b60f7' from 'master'Grzegorz Bizon2017-05-058-39/+57
| |\
| * \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-0313-56/+496
| |\ \
| * \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-05-0221-116/+188
| |\ \ \
| * | | | Extend action tooltop to show info about abilitiesGrzegorz Bizon2017-05-011-1/+5
| * | | | Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-2214-63/+181
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into feature/gb/manual-actions-protected-branches-permi...Grzegorz Bizon2017-04-1339-203/+1264
| |\ \ \ \ \
| * | | | | | Use build policy to determine if user can play buildGrzegorz Bizon2017-04-121-1/+1
| * | | | | | Do not show play action if user not allowed to run itGrzegorz Bizon2017-04-061-1/+1
* | | | | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-063-1/+39
* | | | | | | Merge branch 'fix/fork-spec-mysql' into 'master' Stan Hu2017-05-061-0/+2
|\ \ \ \ \ \ \
| * | | | | | | workaround spec failure for mySQL invalid date issuefix/fork-spec-mysqlJames Lopez2017-05-051-0/+2
* | | | | | | | Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-g...Sean McGivern2017-05-054-37/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ceAlejandro Rodríguez2017-05-052-2/+8
| * | | | | | | | Allow gl-repository strings as project identifiers in PostReceive workerAlejandro Rodríguez2017-05-051-26/+3
| * | | | | | | | Generate and handle a gl_repository param to pass around componentsAlejandro Rodríguez2017-05-032-9/+36
* | | | | | | | | Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'Sean McGivern2017-05-051-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update Import/Export filesblackst0ne2017-05-051-1/+1
* | | | | | | | | | Merge branch 'mia_backort' into 'master' Jacob Schatz2017-05-054-18/+18
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-0523-45/+190
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-044-18/+18
* | | | | | | | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-051-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Review changesadd-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-051-1/+0
| * | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-05-043-8/+17
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-045-30/+39
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0317-73/+522
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-287-51/+72
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixed specsLuke "Jared" Bennett2017-04-281-1/+1
| * | | | | | | | | | | | Remove unneeded helper includeLuke "Jared" Bennett2017-04-281-2/+0
| * | | | | | | | | | | | Fixed view to correct propertyLuke "Jared" Bennett2017-04-281-1/+1
| * | | | | | | | | | | | Attempted adding separate clientside_sentry settingsLuke "Jared" Bennett2017-04-281-1/+1
| * | | | | | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-2622-104/+265
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-1551-197/+1511
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | [ci skip] Remove loadscript class in favour of backend conditionalLuke "Jared" Bennett2017-04-131-1/+0
| * | | | | | | | | | | | | | Merge branch 'master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-04214-1369/+3129
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Added raven and raven-vue plugin, updated gon_helper with data needed for rav...Luke Bennett2017-01-231-0/+6
* | | | | | | | | | | | | | | | Merge branch 'prometheus-integration-test-setting-fix' into 'master' Robert Speicher2017-05-051-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Improved changelog entry, also changed error message for HTTParty errorprometheus-integration-test-setting-fixJose Ivan Vargas2017-05-041-1/+1
| * | | | | | | | | | | | | | | | Improved code styling and added a HTTParty rescue blockJose Ivan Vargas2017-05-041-0/+2
| * | | | | | | | | | | | | | | | Added specsJose Ivan Vargas2017-05-041-5/+5
| * | | | | | | | | | | | | | | | Added rescue block for the test method for the prometheus serviceJose Ivan Vargas2017-05-041-1/+5
| | |_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'mrchrisw-import-shell-timeout'Sean McGivern2017-05-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Add configurable timeout for git fetch and clone operationsmrchrisw-import-shell-timeoutChris Wilson2017-04-271-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Fix email receiver metrics eventsfix-email-receiver-metricsSean McGivern2017-05-053-3/+3
* | | | | | | | | | | | | | | | Merge branch 'adam-separate-slash-commands' into 'master' Rémy Coutable2017-05-052-15/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Display slash commands outcome when previewing Markdownadam-separate-slash-commandsRares Sfirlogea2017-05-042-15/+83
* | | | | | | | | | | | | | | | | Some small updates for Spanish translations.Ruben Davila2017-05-043-3/+3