summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'issues/1608-text' into 'master' Sean McGivern2016-12-052-2/+2
|\
| * change the date label to match the date usedBM5k2016-12-032-2/+2
* | Merge branch 'fix/rename-mwbs-to-merge-when-pipeline-succeeds' into 'master' Kamil Trzciński2016-12-052-3/+3
|\ \
| * \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-3044-172/+193
| |\ \
| * \ \ Merge branch 'master' into fix/rename-mwbs-to-merge-when-pipeline-succeedsGrzegorz Bizon2016-11-2568-289/+584
| |\ \ \
| * | | | Rename MWPS in user interface and feature testsGrzegorz Bizon2016-11-211-2/+2
| * | | | Rename MWPS in system notes and related testsGrzegorz Bizon2016-11-211-1/+1
* | | | | Merge branch 'mr-origin-7855' into 'master' Rémy Coutable2016-12-022-2/+2
|\ \ \ \ \
| * | | | | WIP: Adds a default commit message when adding a README (#25167)mattl2016-12-021-1/+1
| * | | | | WIP: Adds a default commit message when adding a README (#25167)25167-default-readme-commit-messageMatt Lee2016-11-301-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '25098-header-margins-on-pipeline-settings' into 'master' Annabel Dunstone Gray2016-12-021-1/+1
|\ \ \ \ \
| * | | | | Fixed row margins on Pipeline Settings page in order to unify stylesRyan Harris2016-12-011-1/+1
* | | | | | Merge branch '24726-remove-across-gitlab' into 'master' Annabel Dunstone Gray2016-12-011-1/+0
|\ \ \ \ \ \
| * | | | | | 24726 Remove Across GitLab from side navigation24726-remove-across-gitlabtauriedavis2016-12-011-1/+0
| |/ / / / /
* | | | | | Merge branch '24814-pipeline-tabs' into 'master' Fatih Acet2016-12-012-8/+11
|\ \ \ \ \ \
| * | | | | | Adds tests for builds url and tabs behaviourFilipa Lacerda2016-11-302-3/+3
| * | | | | | Fix after reviewFilipa Lacerda2016-11-302-11/+1
| * | | | | | Adds tests for tabs in the rspec for pipelinesFilipa Lacerda2016-11-301-3/+3
| * | | | | | Pipelines tabsFilipa Lacerda2016-11-301-5/+18
| | |/ / / / | |/| | | |
* | | | | | Merge branch '24281-issue-merge-request-sidebar-subscribe-button-style-improv...Fatih Acet2016-12-012-16/+7
|\ \ \ \ \ \
| * | | | | | rewrite subscription javascript to accomodate new designMike Greiling2016-11-302-9/+5
| * | | | | | Remove the help text under the sidebar subscribe button and style it inlineDimitrie Hoekstra2016-11-301-7/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '18546-update-wiki-page-design' into 'master' Fatih Acet2016-12-018-68/+105
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | add special class in cases where sidebar toggle should exist in the marginMike Greiling2016-11-304-4/+4
| * | | | | echo changes in 6683fdcf for wiki pages pathMike Greiling2016-11-301-1/+1
| * | | | | use wiki pages index for sidebar overflow and limit sidebar list to 15 pagesMike Greiling2016-11-302-5/+9
| * | | | | update wiki pages with new designMike Greiling2016-11-305-24/+31
| * | | | | add wiki page list to sidebarMike Greiling2016-11-301-5/+4
| * | | | | update design of wiki git access pageMike Greiling2016-11-301-24/+22
| * | | | | add active states to sidebar navMike Greiling2016-11-301-3/+5
| * | | | | move wiki navbar content to right sidebarMike Greiling2016-11-307-23/+50
| |/ / / /
* | | | | Merge branch '24669-merge-request-dashboard-page-takes-over-a-minute-to-load'...Yorick Peterse2016-12-012-2/+2
|\ \ \ \ \
| * | | | | Save a query on issue and MR listsSean McGivern2016-12-012-2/+2
* | | | | | Merge branch 'use-st-commits-where-possible' into 'master' Yorick Peterse2016-12-012-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-012-2/+2
* | | | | | Merge branch 'refactor-issuable-branch-chooser' into 'master' Robert Speicher2016-12-012-24/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Refactor branch chooser in issuable formrefactor-issuable-branch-chooserRémy Coutable2016-11-302-24/+31
| | |/ / / | |/| | |
* | | | | Merge branch '24710-fix-generic-commit-status-table-row' into 'master' Fatih Acet2016-11-302-39/+52
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | collapse nested if statementMike Greiling2016-11-292-6/+4
| * | | | remove redundant if statementMike Greiling2016-11-292-4/+0
| * | | | reformat build duration and finish time to match /ci/builds/_build.html.hamlMike Greiling2016-11-291-8/+12
| * | | | reorder generic commit status columns to match build status partialMike Greiling2016-11-291-22/+29
| * | | | fetch local parameters in _generic_commit_status.html.haml similar to how _bu...Mike Greiling2016-11-291-8/+16
* | | | | Merge branch 'issue_24363' into 'master' Fatih Acet2016-11-306-37/+105
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix appearance in error pagesLuis Alonso Chavez Armendariz2016-11-296-37/+105
* | | | | Merge branch 'fix/rename-merge-request-head-pipeline' into 'master' Kamil Trzciński2016-11-303-6/+6
|\ \ \ \ \
| * | | | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-293-6/+6
* | | | | | Merge branch 'improve/invite-accept-page' into 'master' Douwe Maan2016-11-301-3/+10
|\ \ \ \ \ \
| * | | | | | Alert user when logged in user email is not the same as the invitationDouglas Barbosa Alexandre2016-11-291-3/+10
* | | | | | | Merge branch '25002-sentence-case-dashboard-tabs' into 'master' Annabel Dunstone Gray2016-11-301-3/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |