summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'build-statuses' into 'master' Rémy Coutable2016-12-1414-41/+46
|\
| * Improve build status specs contexts descriptionsGrzegorz Bizon2016-12-141-0/+2
| * Update manual build icon SVGGrzegorz Bizon2016-12-131-1/+1
| * Extract abilities checking module from ability modelGrzegorz Bizon2016-12-131-6/+0
| * Make it possible to retry build that was canceledGrzegorz Bizon2016-12-131-1/+1
| * Make build retryable only if complete and executedGrzegorz Bizon2016-12-131-1/+2
| * Improve readability in methods for detailed statusGrzegorz Bizon2016-12-134-4/+12
| * Use manual build icon in play/stop build statusesGrzegorz Bizon2016-12-131-2/+0
| * Adds manual action icon and case to show itFilipa Lacerda2016-12-132-0/+3
| * Fix detailed status badge for generic commit statusGrzegorz Bizon2016-12-121-1/+1
| * Improve detailed status badge partialGrzegorz Bizon2016-12-128-18/+14
| * Revert some unneeded changesKamil Trzcinski2016-12-121-1/+1
| * Rename icon_with_label to icon_with_descriptionKamil Trzcinski2016-12-128-8/+9
| * Fix auto loading of constants for Ci StatusesKamil Trzcinski2016-12-125-15/+16
| * Fix some detailed statuses specs related to abilitiesGrzegorz Bizon2016-12-121-0/+6
| * Remove ci_status_with_icon helper and replace it with partial [ci skip]Kamil Trzcinski2016-12-128-34/+17
| * Improve actionsKamil Trzcinski2016-12-121-0/+4
| * Added Ci::Status::BuildKamil Trzcinski2016-12-122-0/+8
* | Merge branch '25136-last-deployment-link' into 'master' Grzegorz Bizon2016-12-142-4/+5
|\ \
| * | Changes after review25136-last-deployment-linkFilipa Lacerda2016-12-072-7/+5
| * | Changes after reviewFilipa Lacerda2016-12-072-9/+7
| * | Fix broken link for latest deploymentFilipa Lacerda2016-12-072-2/+7
* | | Merge branch '20052-actions-table-vscroll' into 'master' Annabel Dunstone Gray2016-12-132-13/+12
|\ \ \
| * | | Prevent overflow with vertical scroll when we have space to show content20052-actions-table-vscrollFilipa Lacerda2016-12-132-13/+12
* | | | Merge branch 'backport/group-policies' into 'master' Rémy Coutable2016-12-132-0/+12
|\ \ \ \
| * | | | Backport hooks on group policies for the EE-specific implementationbackport/group-policiesDouglas Barbosa Alexandre2016-12-132-0/+12
* | | | | Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master' Rémy Coutable2016-12-131-1/+1
|\ \ \ \ \
| * | | | | For single line git commit messages, the close quote should be on the same li...jzinn/gitlab-ce-chomp-git-status-messageJulian Zinn2016-12-131-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-131-4/+0
|\ \ \ \ \
| * | | | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-131-4/+0
* | | | | | Merge branch '25518-uniquely-style-labels' into 'master' Fatih Acet2016-12-133-1/+4
|\ \ \ \ \ \
| * | | | | | added border-radius and padding to labels25518-uniquely-style-labelsDimitrie Hoekstra2016-12-133-1/+4
* | | | | | | Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-131-3/+4
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-111-3/+3
| * | | | | | Validate presence of route by Routable concernDmitriy Zaporozhets2016-12-111-0/+1
* | | | | | | Merge branch '3478-copy-commit-hash-to-clipboard' into 'master' Sean McGivern2016-12-134-16/+8
|\ \ \ \ \ \ \
| * | | | | | | Tweak style and add back wordingvictorwu2016-12-121-1/+2
| * | | | | | | Clean up commit copy to clipboard and make consistentvictorwu2016-12-124-15/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-dif...Fatih Acet2016-12-133-4/+7
|\ \ \ \ \ \ \
| * | | | | | | Instantiate ImageFile for diff-files in Diff24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-imageLuke "Jared" Bennett2016-12-043-4/+7
* | | | | | | | Merge branch 'issue_13270' into 'master' Sean McGivern2016-12-131-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow to delete tag release noteissue_13270Felipe Artur2016-12-121-1/+8
* | | | | | | | | Merge branch '25155-fix-edited-text-in-comments' into 'master' Fatih Acet2016-12-121-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | break comment "edited at" block out of the note-text element to prevent issue...25155-fix-edited-text-in-commentsMike Greiling2016-12-121-1/+1
* | | | | | | | | | Merge branch '25286-customer-label-doesn-t-autocomplete-correctly' into 'mast...Alfredo Sumaran2016-12-121-10/+11
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Added special char test to the default beforeInsert callback. I removed the q...25286-customer-label-doesn-t-autocomplete-correctlyLuke "Jared" Bennett2016-12-081-10/+11
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '19550-fix-contributer-graph-duplicates' into 'master' Alfredo Sumaran2016-12-121-4/+7
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | normalize author email so we can treat it as case insensitiveMike Greiling2016-12-101-4/+7
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '25106-hide-issue-mr-button-for-not-loggedin' into 'master' Fatih Acet2016-12-122-5/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | removes extra if check25106-hide-issue-mr-button-for-not-loggedinNur Rony2016-12-121-5/+4
View Lorry Controller Status