summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'merge-conflicts-editor-2' into 'master' Jacob Schatz2016-10-1810-89/+96
|\
| * Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-1733-276/+300
| |\
| * | Fix discard messageAlfredo Sumaran2016-10-131-1/+1
| * | Improve components for PhantomJs compatibilityAlfredo Sumaran2016-10-139-66/+47
| * | Improve diff view switching and componentsAlfredo Sumaran2016-10-135-56/+49
| * | Do not show Diff view switcher if all files are can be only resolved with an ...Alfredo Sumaran2016-10-131-1/+1
| * | Ability to resolve conflicts for files with `text-editor` as conflict typeAlfredo Sumaran2016-10-134-25/+26
| * | Refactor JS codeAlfredo Sumaran2016-10-133-5/+5
| * | Replace loading text with spinnerAlfredo Sumaran2016-10-131-1/+2
| * | Style for resolve conflicts formAlfredo Sumaran2016-10-131-10/+17
| * | Styles for discard alertAlfredo Sumaran2016-10-131-3/+4
| * | Replace textarea with Ace editorAlfredo Sumaran2016-10-132-1/+3
| * | Implement editor to manually resolve merge conflictsAlfredo Sumaran2016-10-137-19/+40
* | | Added download-button class and applied button margin23380-no-space-between-buttons-on-files-pageLuke Bennett2016-10-171-1/+1
| |/ |/|
* | Added logic to handle a revision input that does not exist in the menuLuke Bennett2016-10-161-2/+2
* | Clean up stray Sign up ref.Bryce Johnson2016-10-151-1/+1
* | Merge branch '18844-missing-subnavs-on-some-pages' into 'master' Fatih Acet2016-10-1414-193/+233
|\ \
| * | Added subnav to labels edit+new and milestones edit+new+show18844-missing-subnavs-on-some-pagesLuke Bennett2016-10-0714-193/+233
* | | Merge branch '23167-min-row-height' into 'master' Fatih Acet2016-10-146-6/+6
|\ \ \
| * | | Set height on build page rowsAnnabel Dunstone Gray2016-10-101-1/+1
| * | | Replace generic table withAnnabel Dunstone Gray2016-10-106-6/+6
* | | | Merge branch 'mr-tabs-affix' into 'master' Fatih Acet2016-10-141-1/+1
|\ \ \ \
| * | | | Don't run affix tabs in test envmr-tabs-affixPhil Hughes2016-10-101-1/+1
| * | | | Merge request tabs stick when scrolling pagePhil Hughes2016-10-061-1/+1
* | | | | Merge branch 'gfm-source-once' into 'master' Rémy Coutable2016-10-141-3/+1
|\ \ \ \ \
| * | | | | Loads GFM once for per pagegfm-source-oncePhil Hughes2016-10-141-3/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'members-ui' into 'master' Fatih Acet2016-10-147-55/+52
|\ \ \ \ \
| * | | | | Changed how collections are renderedPhil Hughes2016-10-064-7/+4
| * | | | | Merge branch 'master' into members-uiPhil Hughes2016-10-0613-100/+93
| |\ \ \ \ \
| * | | | | | Updated Ruby variable namePhil Hughes2016-10-052-4/+4
| * | | | | | Merge branch 'master' into members-uiPhil Hughes2016-10-0461-388/+521
| |\ \ \ \ \ \
| * | | | | | | Border instead of hrPhil Hughes2016-10-041-2/+1
| * | | | | | | Ruby updatePhil Hughes2016-09-132-3/+3
| * | | | | | | Fixed group_links expire date not updating in viewPhil Hughes2016-09-131-1/+1
| * | | | | | | CSS cleanupPhil Hughes2016-09-132-2/+2
| * | | | | | | Updated some specsPhil Hughes2016-09-132-3/+3
| * | | | | | | Updated groups member UI to matchPhil Hughes2016-09-131-1/+1
| * | | | | | | Added import button back inPhil Hughes2016-09-131-2/+2
| * | | | | | | Tests updatePhil Hughes2016-09-132-2/+2
| * | | | | | | Fixed issue with invited users not showing upPhil Hughes2016-09-131-3/+2
| * | | | | | | Mobile spacing improvementsPhil Hughes2016-09-131-3/+4
| * | | | | | | Mobile improvementsPhil Hughes2016-09-131-1/+1
| * | | | | | | Fixed group members not deletingPhil Hughes2016-09-132-2/+5
| * | | | | | | Fixed issue with groups not displayingPhil Hughes2016-09-131-4/+2
| * | | | | | | Included groups on project_members pagePhil Hughes2016-09-135-18/+22
| * | | | | | | Updates the member row when values changedPhil Hughes2016-09-131-2/+2
| * | | | | | | Updated members UIPhil Hughes2016-09-133-32/+28
* | | | | | | | Moved ci_status environments logic to new action ci_envrionments_status and s...Luke Bennett2016-10-141-0/+1
* | | | | | | | Fix indenting error in HAMLZ.J. van de Weg2016-10-141-2/+2
* | | | | | | | Show what time ago a MR was deployedZ.J. van de Weg2016-10-142-15/+3
| |_|_|/ / / / |/| | | | | |
View Lorry Controller Status