summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'fix/gb/hide-environment-external-url-btn-when-not-provided' int...Kamil Trzciński2017-05-063-2/+39
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge commit '3a2b60f7a' from 'master'fix/gb/hide-environment-external-url-btn-when-not-providedGrzegorz Bizon2017-05-05529-2804/+12994
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Add changelog entry for external env URL btn fixGrzegorz Bizon2017-05-021-0/+4
| * | | | | | | | | | Hide environment external URL button if not definedGrzegorz Bizon2017-05-022-2/+35
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'pages-0.4.2' into 'master' Kamil Trzciński2017-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use GitLab Pages v0.4.2pages-0.4.2Nick Thomas2017-05-051-1/+1
* | | | | | | | | | | Merge branch 'zj-real-time-pipelines' into 'master' Kamil Trzciński2017-05-0617-11/+637
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | Fix broken css classFilipa Lacerda2017-05-061-2/+2
| | | | | | | | | * | | Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-...Kamil Trzcinski2017-05-0640-294/+1321
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Real time pipeline show actionZeger-Jan van de Weg2017-05-0617-11/+637
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix-routable-find-by-full-path-on-mysql' into 'master' Sean McGivern2017-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix `Routable.find_by_full_path` on MySQLfix-routable-find-by-full-path-on-mysqlSean McGivern2017-05-061-1/+1
* | | | | | | | | | | Merge branch '23751-add-contribution-graph-key-tooltips' into 'master' Filipa Lacerda2017-05-062-9/+21
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | add CHANGELOG.md entry for !1113823751-add-contribution-graph-key-tooltipsMike Greiling2017-05-051-0/+4
| * | | | | | | | | | add tooltips to user contrib graph keyMike Greiling2017-05-051-9/+17
* | | | | | | | | | | Merge branch '17361-redirect-renamed-paths' into 'master' Sean McGivern2017-05-0636-162/+1207
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Reduce risk of deadlocks17361-redirect-renamed-pathsMichael Kozono2017-05-052-21/+18
| * | | | | | | | | | Resolve discussionsMichael Kozono2017-05-052-7/+6
| * | | | | | | | | | Resolve discussionsMichael Kozono2017-05-058-25/+31
| * | | | | | | | | | Dry up routable lookups. Fixes #30317Michael Kozono2017-05-055-55/+58
| * | | | | | | | | | Add “project moved” flash message on redirectMichael Kozono2017-05-054-0/+9
| * | | | | | | | | | Resolve discussionsMichael Kozono2017-05-055-23/+42
| * | | | | | | | | | Fix Rubocop failuresMichael Kozono2017-05-053-7/+6
| * | | | | | | | | | Index redirect_routes path for LIKEMichael Kozono2017-05-053-0/+31
| * | | | | | | | | | Add index for source association and for pathMichael Kozono2017-05-052-1/+26
| * | | | | | | | | | Fix or workaround spec failureMichael Kozono2017-05-051-2/+2
| * | | | | | | | | | RefactorMichael Kozono2017-05-052-9/+9
| * | | | | | | | | | Delete conflicting redirectsMichael Kozono2017-05-054-20/+127
| * | | | | | | | | | Create redirect routes on path changeMichael Kozono2017-05-052-8/+50
| * | | | | | | | | | Redirect from redirect routes to canonical routesMichael Kozono2017-05-0530-87/+668
| * | | | | | | | | | Add happy path feature tests for redirect behaviorMichael Kozono2017-05-053-28/+255
* | | | | | | | | | | Merge branch 'use-absolute-path-for-gettext-config' into 'master' Stan Hu2017-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use an absolute path for locale path in FastGettext configuse-absolute-path-for-gettext-configRuben Davila2017-05-051-1/+1
* | | | | | | | | | | | Merge branch 'attemp-to-fix-issue_sidebar_spec-again' into 'master' Stan Hu2017-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Trigger click instead of actual click to make sure the right button is always...attemp-to-fix-issue_sidebar_spec-againLuke "Jared" Bennett2017-05-051-1/+1
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | 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 'winh-visual-token-labels' into 'master' Jacob Schatz2017-05-0514-7/+431
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Colorize labels in issue search fieldWinnie Hellmann2017-05-0514-7/+431
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-g...Sean McGivern2017-05-0516-140/+268
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Pass GL_REPOSITORY in Workhorse responses29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ceAlejandro Rodríguez2017-05-056-6/+32
| * | | | | | | | | | | Allow gl-repository strings as project identifiers in PostReceive workerAlejandro Rodríguez2017-05-053-50/+53
| * | | | | | | | | | | Generate and handle a gl_repository param to pass around componentsAlejandro Rodríguez2017-05-0310-85/+184
* | | | | | | | | | | | Merge branch 'droplab-item-ignore-docs' into 'master' Clement Ho2017-05-051-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Include droplab-item-ignore in droplab docsdroplab-item-ignore-docsLuke "Jared" Bennett2017-04-201-0/+2
* | | | | | | | | | | | | Merge branch 'fix/admin-integrations' into 'master' Sean McGivern2017-05-058-0/+295
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | refactor code based on feedbackfix/admin-integrationsJames Lopez2017-05-053-15/+17
| * | | | | | | | | | | | | refactor code based on feedbackJames Lopez2017-05-052-2/+2
| * | | | | | | | | | | | | refactor code based on feedbackJames Lopez2017-05-058-47/+34
| * | | | | | | | | | | | | add callbacks in bulkJames Lopez2017-05-052-6/+42