summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-064-3/+4
|\
| * Index redirect_routes path for LIKEMichael Kozono2017-05-051-0/+1
| * Redirect from redirect routes to canonical routesMichael Kozono2017-05-053-3/+3
* | 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-056-79/+67
|\ \ \
| * | | Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ceAlejandro Rodríguez2017-05-053-3/+9
| * | | 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-034-51/+56
* | | | 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-0514-40/+74
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ...Valery Sizov2017-05-0528-49/+217
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | [Multiple issue assignee] Fix a number of specsValery Sizov2017-05-051-1/+1
| * | | | [Multiple issue assignee]: reslving some conflictsValery Sizov2017-05-041-4/+0
| * | | | Backport of multiple_assignees_feature [ci skip]Valery Sizov2017-05-0413-38/+76
* | | | | Merge branch 'add-sentry-js-again-with-vue' into 'master' Phil Hughes2017-05-052-0/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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-046-12/+27
| |\ \ \ \
| * | | | | Removed clientside_sentry ref in settings.rbLuke "Jared" Bennett2017-05-041-1/+1
| * | | | | Review changes, removed api/v3 updates as its frozen, removed the clientside_...Luke "Jared" Bennett2017-05-041-4/+0
| * | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0410-39/+65
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-05-0325-92/+537
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-281-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vueLuke "Jared" Bennett2017-04-2834-158/+1034
| |\ \ \ \ \ \ \
| * | | | | | | | 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-283-2/+11
| * | | | | | | | Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-2646-195/+450
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 'add-sentry-js-again-with-vue'Luke "Jared" Bennett2017-04-15110-522/+2340
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | [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-04395-2973/+11142
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | 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
* | | | | | | | | | | | | | Merge branch 'master' into 28433-internationalise-cycle-analytics-pageRuben Davila2017-05-0423-98/+162
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix wording of Cycle Analytics stage legendsDouwe Maan2017-05-043-3/+3
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'dm-artifact-blob-viewer' into 'master' Sean McGivern2017-05-041-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Add artifact file page that uses the blob viewerdm-artifact-blob-viewerDouwe Maan2017-05-041-0/+6
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch '30973-network-graph-sorted-by-date-and-topo' into 'master' Douwe Maan2017-05-041-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \