summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-label-reference-filter' into 'master' Robert Speicher2016-07-131-3/+6
|\
| * Simplify regex for string-based multi-word label surrounded in quotesfix-label-reference-filterDouglas Barbosa Alexandre2016-07-131-1/+1
| * Doesn't match empty label references surrounded in quotesDouglas Barbosa Alexandre2016-07-131-1/+1
| * Fix markdown rendering for label references that contains `.`Douglas Barbosa Alexandre2016-07-131-2/+2
| * Fix markdown rendering for label references that begin with a digitDouglas Barbosa Alexandre2016-07-131-1/+4
| * Fix markdown rendering for consecutive label referencesDouglas Barbosa Alexandre2016-07-131-1/+1
* | Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-1315-47/+20
* | Merge branch 'dropdown-load-fix' into 'master' Douwe Maan2016-07-131-1/+1
|\ \ | |/ |/|
| * removes redundant filter_branches filetiagonbotelho2016-07-121-8/+0
| * fixes test for simplified version of projecttiagonbotelho2016-07-121-0/+8
| * adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-121-1/+0
| * fixes missing field on basicprojectdetailstiagonbotelho2016-07-121-0/+1
| * removes debugging printtiagonbotelho2016-07-121-1/+0
| * gets the new object through /simple endpoint and renders on the dropdowntiagonbotelho2016-07-121-0/+1
| * adds test to check json fields on simple request and changes the url request ...tiagonbotelho2016-07-122-2/+1
| * fixes missing field on basicprojectdetailstiagonbotelho2016-07-121-0/+1
| * changes the usage of simpleprojectdetails to already implemented basicproject...tiagonbotelho2016-07-121-1/+1
| * removes debugging printtiagonbotelho2016-07-121-1/+0
| * gets the new object through /simple endpoint and renders on the dropdowntiagonbotelho2016-07-122-1/+2
* | Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-131-2/+2
* | Move all "checks" under `GitLab::Checks`.Timothy Andrew2016-07-131-1/+1
* | Don't ask the user to "merge this request manually".Timothy Andrew2016-07-132-1/+6
* | Clean up `protected_branches.js.coffee`Timothy Andrew2016-07-131-6/+3
* | Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-134-5/+5
* | Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-132-7/+11
* | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-138-6/+27
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-07-1323-131/+290
|\ \
| * \ Merge branch '19693-emoji-awards-aren-t-deleted-for-deleted-users' into 'mast...Douwe Maan2016-07-121-1/+1
| |\ \
| | * | Delete award emoji when deleting a user19693-emoji-awards-aren-t-deleted-for-deleted-usersSean McGivern2016-07-121-1/+1
| * | | Change running status color to blue; update icon to spinnerAnnabel Dunstone2016-07-123-6/+17
| * | | Merge branch '19708-label-selection-clutter' into 'master' Jacob Schatz2016-07-121-1/+7
| |\ \ \
| | * | | Add margin to filter labels19708-label-selection-clutterAnnabel Dunstone2016-07-111-1/+7
| * | | | Merge branch '19692-gray-block' into 'master' Jacob Schatz2016-07-121-1/+1
| |\ \ \ \
| | * | | | Update header block class on snippets page19692-gray-blockAnnabel Dunstone2016-07-111-1/+1
| | |/ / /
| * | | | Merge branch '17760-pipeline-builds-design' into 'master' Jacob Schatz2016-07-1216-119/+261
| |\ \ \ \
| | * | | | Update duration representation on builds pagesAnnabel Dunstone2016-07-122-2/+2
| | * | | | Fix label alignment bug; re-add build-linkAnnabel Dunstone2016-07-123-17/+20
| | * | | | Add new stopwatch and commit icons; rename custom icon helper; fix commit pip...Annabel Dunstone2016-07-129-15/+31
| | * | | | Rearrange and update admin buildsAnnabel Dunstone2016-07-124-48/+47
| | * | | | Update builds pageAnnabel Dunstone2016-07-123-57/+56
| | * | | | Add link to pipline IDAnnabel Dunstone2016-07-121-1/+2
| | * | | | Add empty deploy dropdown buttonAnnabel Dunstone2016-07-122-9/+46
| | * | | | Set width on stage columns; min width on table with scroll on mobile; add ava...Annabel Dunstone2016-07-126-46/+93
| | * | | | Move pipeline ID to commit column; add status; branch style updatesAnnabel Dunstone2016-07-123-7/+38
| | * | | | Add clock and calendar icons for duration and finished at; add finished at se...Annabel Dunstone2016-07-123-0/+9
| * | | | | Merge branch 'rs-delimit-done-todos' into 'master' Robert Speicher2016-07-121-2/+2
| |\ \ \ \ \
| | * | | | | Use number_with_delimiter for Todos pending/done tab countsRobert Speicher2016-07-121-2/+2
| | |/ / / /
| * | | | | Merge branch '18935-pipeline-button' into 'master' Jacob Schatz2016-07-121-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Change new pipeline to run pipeline18935-pipeline-buttonAnnabel Dunstone2016-07-061-1/+1
* | | | | | Merge branch 'add-2fa-check-to-oauth' into 'master' Robert Speicher2016-07-121-1/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
View Lorry Controller Status