summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cleaner-merge-commit-messages' into 'master' Sean McGivern2016-12-173-6/+24
|\
| * add js prefix to classes used to toggle description on commit message in merg...Gabriel Gizotti2016-12-161-4/+4
| * Show either description or closes issues references on MergeRequest#merge_com...Gabriel Gizotti2016-12-161-5/+3
| * better text for mentioned but not closedGabriel Gizotti2016-12-161-1/+1
| * add mentioned but not closed message to the same line as closes issueswqGabriel Gizotti2016-12-161-13/+14
| * extract duplicate logic into a variable on _commit_message_containerGabriel Gizotti2016-12-161-2/+3
| * move javascript code from _commit_message_container view to javascripts/merge...Gabriel Gizotti2016-12-161-21/+0
| * backend completely drives creation of merge commit messageGabriel Gizotti2016-12-163-25/+21
| * only render MR description toggle javascript if description is availableGabriel Gizotti2016-12-161-20/+19
| * keep branch being merged, MR title and MR reference in merge commit message w...Gabriel Gizotti2016-12-161-2/+8
| * Add toggle links for using default message and description on change merge co...Gabriel Gizotti2016-12-162-0/+29
| * better mentioned but not closing message and iconGabriel Gizotti2016-12-161-2/+2
| * diplays mentioned but not merged message on MR show pageGabriel Gizotti2016-12-161-0/+9
* | Merge branch '23573-sort-functionality-for-project-member' into 'master' Douglas Barbosa Alexandre2016-12-173-0/+11
|\ \
| * | Improve test for sort dropdown on members pageNur Rony2016-12-161-1/+1
| * | Remove unused id from shared members sort dropdownDouglas Barbosa Alexandre2016-12-161-1/+1
| * | Remove unnecessary curly braces from sort dropdown partialDouglas Barbosa Alexandre2016-12-161-1/+1
| * | Sort group/project members alphabetically by defaultDouglas Barbosa Alexandre2016-12-161-2/+0
| * | Adds sort dropdown for group membersNur Rony2016-12-163-0/+13
* | | Merge branch 'bitbucket-oauth2' into 'master' Douglas Barbosa Alexandre2016-12-161-17/+28
|\ \ \ | |/ / |/| |
| * | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-1640-97/+138
| |\ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-1416-29/+31
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-14102-561/+726
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-11-3094-385/+502
| |\ \ \ \ \
| * | | | | | Address initial review commentsStan Hu2016-11-211-3/+3
| * | | | | | Support selection of different namespace and project destinationStan Hu2016-11-211-2/+12
| * | | | | | Refactoring Bitbucket import controller to use the new OAuth2 clientDouglas Barbosa Alexandre2016-11-211-17/+18
* | | | | | | Merge branch '25743-clean-up-css-for-project-alerts-and-flash-notifications' ...25428-sort-order-for-pipeline-build-lists-doesn-t-properly-handle-numbersAnnabel Dunstone Gray2016-12-161-3/+4
|\ \ \ \ \ \ \
| * | | | | | | fix margin on alert stripes within ":flash_message" blockMike Greiling2016-12-161-3/+4
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch '18435-autocomplete-is-not-performant' into 'master' Fatih Acet2016-12-161-3/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Changed autocomplete_sources into an action that returns a single 'at' type o...18435-autocomplete-is-not-performantLuke Bennett2016-12-151-3/+11
* | | | | | | Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-168-17/+64
|\ \ \ \ \ \ \
| * | | | | | | View-related (and other minor) changes to !5951 based on @rymai's review.Timothy Andrew2016-12-168-24/+30
| * | | | | | | Move the scopes form/list view into a partial.Timothy Andrew2016-12-166-30/+19
| * | | | | | | Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-162-2/+0
| * | | | | | | Allow creating personal access tokens / OAuth applications with scopes.Timothy Andrew2016-12-166-17/+71
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '22604-manual-actions' into 'master' Grzegorz Bizon2016-12-1613-37/+32
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into 22604-manual-actionsFilipa Lacerda2016-12-163-8/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Changes after reviewFilipa Lacerda2016-12-153-25/+2
| * | | | | | | Merge branch 'master' into '22604-manual-actions'Filipa Lacerda2016-12-1520-43/+44
| |\ \ \ \ \ \ \
| * | | | | | | | Simplify graph status badge partial and require localsGrzegorz Bizon2016-12-141-11/+11
| * | | | | | | | Fix extension in fileFilipa Lacerda2016-12-141-0/+0
| * | | | | | | | Changes after reviewFilipa Lacerda2016-12-141-2/+1
| * | | | | | | | Rename file according to reviewFilipa Lacerda2016-12-143-2/+4
| * | | | | | | | Merge two partials into one. Rename it to match the other partialsFilipa Lacerda2016-12-145-21/+20
| * | | | | | | | Remove unused fileFilipa Lacerda2016-12-141-12/+0
| * | | | | | | | Merge branch 'master' into 22604-manual-actionsGrzegorz Bizon2016-12-1445-175/+239
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove unneeded partialFilipa Lacerda2016-12-134-22/+2
| * | | | | | | | | Replace old icons with new onesFilipa Lacerda2016-12-1317-16/+8
| * | | | | | | | | Fix vertical alignment of action icon with status iconFilipa Lacerda2016-12-121-2/+1
View Lorry Controller Status