summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into 'm...Rémy Coutable2016-10-121-4/+3
|\
| * Create a new /templates API namespaceThomas Balthazar2016-10-121-4/+3
* | Merge branch 'add-disabled-delete-button' into 'master' Robert Speicher2016-10-121-2/+2
|\ \
| * | Add disabled delete button to protected branchesClement Ho2016-10-111-2/+2
* | | Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan2016-10-121-1/+2
|\ \ \ | |_|/ |/| |
| * | refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-mergedtiagonbotelho2016-10-111-6/+3
| * | removes inconsistency regarding tagging immediately as merged once you create...tiagonbotelho2016-10-091-1/+5
* | | Merge branch 'download_snippets' into 'master' Sean McGivern2016-10-122-3/+12
|\ \ \
| * | | Added 'Download' button to snippet viewJustin DiPierro2016-10-112-3/+12
* | | | Merge branch 'select2-fix-for-project-lfs-enabled' into 'master' Rémy Coutable2016-10-111-1/+1
|\ \ \ \
| * | | | FIx JS bug with select2 because of missing `data-field` attribute in select box.Patricio Cano2016-10-111-1/+1
* | | | | Merge branch 'api-fix-project-group-sharing' into 'security'Rémy Coutable2016-10-111-1/+1
* | | | | Merge branch 'allow_multiple_labels_commands' into 'master' Rémy Coutable2016-10-111-3/+18
|\ \ \ \ \
| * | | | | allow multiple labels commandsbarthc2016-10-111-3/+18
* | | | | | Merge branch '22211-500-instead-of-404' into 'master' Sean McGivern2016-10-111-0/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'master' into 22211-500-instead-of-404Linus G Thiel2016-10-11203-651/+1444
| |\ \ \ \ \
| * | | | | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-051-1/+1
| * | | | | | Respond with 404 Not Found for non-existent tagsLinus G Thiel2016-10-051-0/+2
* | | | | | | Merge branch 'assign-issues-for-merge-request-18876' into 'master' Douwe Maan2016-10-114-1/+71
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fixup! Added link to bulk assign issues to MR author. (Issue #18876)James Edwards-Jones2016-10-072-3/+5
| * | | | | | Added link to bulk assign issues to MR author. (Issue #18876)James2016-10-064-1/+69
* | | | | | | Make guests unable to view MRsguests_cant_see_mrsValery Sizov2016-10-114-7/+16
* | | | | | | Merge branch 'docs/refactor-monitoring' into 'master' Achilleas Pipinellis2016-10-111-1/+5
|\ \ \ \ \ \ \
| * | | | | | | Add links to internal docs in Metrics section in the admin areadocs/refactor-monitoringAchilleas Pipinellis2016-09-251-1/+5
* | | | | | | | Merge branch '21604-pipeline-ui-updates' into 'master' Fatih Acet2016-10-1110-119/+198
|\ \ \ \ \ \ \ \
| * | | | | | | | changed the scss for the top line connectors to be exactly centered21604-pipeline-ui-updatesDimitrie Hoekstra2016-10-111-3/+3
| * | | | | | | | Remove negative marginsAnnabel Dunstone Gray2016-10-101-5/+3
| * | | | | | | | slight update to lines and curves positioningDimitrie Hoekstra2016-10-101-3/+5
| * | | | | | | | JS review changes and fixed conflictsLuke Bennett2016-10-101-1/+1
| * | | | | | | | Corrected my correction for turbolinks -.-'Luke Bennett2016-10-102-4/+1
| * | | | | | | | Fix node flex alignmentAnnabel Dunstone Gray2016-10-101-2/+2
| * | | | | | | | JS review changes - Removed window from window.gl in dispatcherLuke Bennett2016-10-105-3/+8
| * | | | | | | | Fix ul htmlAnnabel Dunstone Gray2016-10-102-3/+3
| * | | | | | | | Move hidden class to graph itself; remove background color from play node & a...Annabel Dunstone Gray2016-10-103-6/+5
| * | | | | | | | Finished up margin JS logicLuke Bennett2016-10-104-67/+79
| * | | | | | | | Added final changes from handoverLuke Bennett2016-10-104-26/+36
| * | | | | | | | Change size of pipeline status icons and dropdownsAnnabel Dunstone Gray2016-10-104-21/+41
| * | | | | | | | Change length of connecting lines based on number of buildsAnnabel Dunstone Gray2016-10-102-6/+27
| * | | | | | | | Update pipeline graph styles to match mockupAnnabel Dunstone Gray2016-10-102-15/+30
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'sh-fix-issue-20776' into 'master' Robert Speicher2016-10-111-1/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix Error 500 when viewing old merge requests with bad diff datash-fix-issue-20776Stan Hu2016-10-101-1/+13
| |/ / / / / / /
* | | | | | | | Merge branch 'new-gitlab-users-clear_all_authentication_tokens-task' into 'ma...Robert Speicher2016-10-111-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a safeguard in User#set_projects_limitnew-gitlab-users-clear_all_authentication_tokens-taskRémy Coutable2016-10-111-0/+5
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'precalculate-trending-projects' into 'master' Robert Speicher2016-10-115-31/+50
|\ \ \ \ \ \ \ \
| * | | | | | | | Precalculate trending projectsprecalculate-trending-projectsYorick Peterse2016-10-105-31/+50
* | | | | | | | | Merge branch 'empty-mrs' into 'master' Rémy Coutable2016-10-115-47/+52
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow empty merge requestsArtem Sidorenko2016-10-115-47/+52
* | | | | | | | | | Merge branch 'reserve-robots-txt-namespace' into 'master' Robert Speicher2016-10-111-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add `robots.txt` to the list of reserved namespacesNick Thomas2016-10-111-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'dz-cleanup-routing' into 'master' Dmitriy Zaporozhets2016-10-111-25/+0
|\ \ \ \ \ \ \ \ \