summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsist...Tim Zallmann2017-10-063-10/+18
|\
| * fix linter errors and karma specs37105-monitoring-graph-axes-labels-are-inaccurate-and-inconsistentJose Ivan Vargas2017-10-052-1/+2
| * display x-axis tick marksMike Greiling2017-10-051-2/+7
| * fix x-axis pixel scale to account for transform x-offsetMike Greiling2017-10-051-1/+1
| * rename graph_paths.vue consistent with all other sub-components of graph.vueMike Greiling2017-10-052-1/+1
| * fix spelling ("outter" -> "outer")Mike Greiling2017-10-051-2/+2
| * fix formattingMike Greiling2017-10-051-4/+6
* | Merge branch '38389-allow-merge-without-success' into 'master'Fatih Acet2017-10-053-7/+4
|\ \
| * | Allow merge when no pipeline success38389-allow-merge-without-successEric Eastwood2017-10-053-7/+4
| |/
* | Merge branch '34102-online-view-of-artifacts-fe' into 'master'Nick Thomas2017-10-057-15/+100
|\ \
| * | Test against public projectsZeger-Jan van de Weg2017-10-053-5/+6
| * | Incorporate feedbackZeger-Jan van de Weg2017-10-041-2/+3
| * | Dry up external_link? usageEric Eastwood2017-10-041-9/+8
| * | Merge branch 'master' into 34102-online-view-of-artifacts-feEric Eastwood2017-10-0464-244/+538
| |\ \
| * | | Add JSON as external pages artifactEric Eastwood2017-10-031-1/+1
| * | | Add translation method to external artifact tooltipEric Eastwood2017-10-031-1/+1
| * | | Merge branch '34102-online-view-of-artifacts-fe' of gitlab.com:gitlab-org/git...Zeger-Jan van de Weg2017-10-033-4/+5
| |\ \ \
| | * | | Add test for external HTML artifactEric Eastwood2017-10-032-2/+2
| | * | | Use CSS to space external link icon from textEric Eastwood2017-10-022-2/+3
| | * | | Add changelog for online view of HTML artifactsEric Eastwood2017-10-021-1/+1
| * | | | Redirect to pages daemonZeger-Jan van de Weg2017-10-035-41/+41
| |/ / /
| * | | Backend for HTML serving with GitLab PagesZeger-Jan van de Weg2017-10-022-4/+34
| * | | Add external link FE for online artifactsEric Eastwood2017-09-294-7/+60
* | | | Merge branch 'zj-gitaly-namespace-service' into 'master'Douwe Maan2017-10-051-0/+2
|\ \ \ \
| * | | | Gitaly namespace service enabled for GitLabZeger-Jan van de Weg2017-10-051-0/+2
* | | | | Merge branch 'rc/fix/gh-import-branches-performance' into 'master'Sean McGivern2017-10-053-6/+23
|\ \ \ \ \
| * | | | | No need to rescue Rugged::ConfigError in RepositoryMirroringRémy Coutable2017-10-051-3/+0
| * | | | | Minor improvements after latest reviewRémy Coutable2017-10-051-8/+4
| * | | | | Move `fetch_ref` from MergeRequestDiff#ensure_commit_shas to MergeRequestRémy Coutable2017-10-052-2/+3
| * | | | | Keep only the changes that are known to work wellRémy Coutable2017-10-052-15/+18
| * | | | | Fetch and map refs/pull to refs/merge-requests in the GH importJames Lopez2017-10-052-3/+23
* | | | | | Merge branch '32163-protected-branch-form-should-have-sane-defaults-for-dropd...Tim Zallmann2017-10-052-9/+48
|\ \ \ \ \ \
| * | | | | | address-code-styling32163-protected-branch-form-should-have-sane-defaults-for-dropdownsJose Ivan Vargas2017-10-041-4/+4
| * | | | | | Merge branch 'master' into 32163-protected-branch-form-should-have-sane-defau...Jose Ivan Vargas2017-10-03162-4136/+1224
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 32163-protected-branch-form...Jose Ivan Vargas2017-09-26289-2355/+5387
| |\ \ \ \ \ \ \
| * | | | | | | | Addressed observationsJose Ivan Vargas2017-09-261-6/+6
| * | | | | | | | Added defaults for the protected branches dropdowns for the repository settingsJose Ivan Vargas2017-09-202-9/+48
* | | | | | | | | Merge branch 'save-a-query-on-todos-with-no-filters' into 'master'Yorick Peterse2017-10-051-4/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Save a query on the todos index pagesave-a-query-on-todos-with-no-filtersSean McGivern2017-10-041-4/+26
* | | | | | | | | | Merge branch 'backport_from_EE' into 'master'Rémy Coutable2017-10-051-3/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Minor backport from EEbackport_from_EEValery Sizov2017-10-051-3/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'digitalmoksha/gitlab-ce-feature/verify_secondary_emails' into '...Sean McGivern2017-10-0523-96/+149
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-05376-6001/+3309
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | spacing and small optimisationsAlexandra2017-10-018-21/+21
| * | | | | | | | | | fix whitespaceBrett Walker2017-09-242-3/+2
| * | | | | | | | | | must now set the devise default scope (since we now have an :email scope)Brett Walker2017-09-242-2/+2
| * | | | | | | | | | add primary email as a secondary email whenever the primary is changedBrett Walker2017-09-231-7/+5
| * | | | | | | | | | more explantion why an `after_update` was replaced with an `after_commit`Brett Walker2017-09-231-2/+4
| * | | | | | | | | | added email.confirmed scope and fix email comparisonBrett Walker2017-09-232-3/+6
| * | | | | | | | | | allow a verified secondary email to be use as the primary withoutBrett Walker2017-09-231-4/+14
View Lorry Controller Status