summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-134-26/+27
* Move all "checks" under `GitLab::Checks`.Timothy Andrew2016-07-135-22/+22
* Appease rubocop.Timothy Andrew2016-07-132-2/+0
* Add "Developers can Merge" (to protected branches) to the CHANGELOG.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-1312-223/+270
* Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-1310-85/+167
* Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-1315-14/+88
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-07-1370-257/+487
|\
| * Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan2016-07-133-24/+57
| |\
| | * Rename constant to be more descriptiveDouwe Maan2016-07-131-2/+2
| | * Extended regexes ignore whitespace, so use \smulti-line-inline-diffDouwe Maan2016-07-121-2/+2
| | * Render inline diffs for multiple changed lines following eachotherDouwe Maan2016-07-113-24/+57
| * | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-strict-host-headers'Douwe Maan2016-07-123-2/+16
| |\ \
| | * | Defend against 'Host' header injectionJacob Vosmaer2016-07-123-2/+13
| * | | Merge branch '19693-emoji-awards-aren-t-deleted-for-deleted-users' into 'mast...Douwe Maan2016-07-124-3/+25
| |\ \ \
| | * | | Delete award emoji when deleting a user19693-emoji-awards-aren-t-deleted-for-deleted-usersSean McGivern2016-07-124-3/+25
| * | | | Merge branch '17702-running-icon' into 'master' Jacob Schatz2016-07-124-6/+18
| |\ \ \ \
| | * | | | Update CHANGELOG17702-running-iconAnnabel Dunstone2016-07-121-0/+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-1217-119/+262
| |\ \ \ \ \
| | * | | | | Update duration representation on builds pagesAnnabel Dunstone2016-07-122-2/+2
| | * | | | | Update CHANGELOGAnnabel Dunstone2016-07-121-0/+1
| | * | | | | 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 'rs-describe-symbols' into 'master' Robert Speicher2016-07-1240-98/+98
| |\ \ \ \ \ \ \
| | * | | | | | | Avoid `describe`-ing symbols in specsrs-describe-symbolsRobert Speicher2016-07-1241-110/+110
| * | | | | | | | 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-124-6/+78
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Refactor `mock_auth_hash`Patricio Cano2016-07-111-1/+1
| * | | | | | | | Added a lot of stubbing to make sure OAUth requests are handled properly with...Patricio Cano2016-07-074-3/+30
| * | | | | | | | Move Omniauth specific setup to its own filePatricio Cano2016-07-072-3/+2
| * | | | | | | | Change order of stubbing to fix testsPatricio Cano2016-07-042-2/+1
| * | | | | | | | Added tests for 2FA check on OAuth requestPatricio Cano2016-07-044-7/+53
| * | | | | | | | Add 2FA check to the OAuth authentication mechanismPatricio Cano2016-06-291-0/+1