summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-colorFatih Acet2016-06-062-2/+7
* Merge branch 'jquery2' into 'master' Jacob Schatz2016-06-068-18/+274
|\
| * Fixed JS errorsjquery2Phil Hughes2016-06-056-17/+15
| * Upgraded jQuery to version 2Phil Hughes2016-06-052-1/+259
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-0649-146/+1889
|\ \
| * \ Merge branch '15337-yubikey-support' into 'master' Rémy Coutable2016-06-0649-146/+1889
| |\ \
| | * | Add the U2F feature to the CHANGELOG15337-yubikey-supportTimothy Andrew2016-06-061-0/+1
| | * | Add documentation for U2F registration & authentication.Timothy Andrew2016-06-063-6/+57
| | * | Add feature specs covering U2F registration and authentication.Timothy Andrew2016-06-062-0/+275
| | * | Add a U2F-specific audit log entry after logging in.Timothy Andrew2016-06-062-3/+36
| | * | Implement authentication (login) using a U2F device.Timothy Andrew2016-06-068-43/+230
| | * | Implement U2F registration.Timothy Andrew2016-06-0616-65/+1086
| | * | Render `gon` data in the page `body`, not `head`Timothy Andrew2016-06-065-2/+5
| | * | Update the `browser` gem.Timothy Andrew2016-06-063-5/+5
| | * | Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-0613-22/+194
| |/ /
* | | Merge branch 'fix/unauthorized-access-to-build-data' into 'master' Douwe Maan2016-06-063-34/+138
|\ \ \ | |/ / |/| |
| * | Remove 'unscoped' from project builds selectionTomasz Maczukin2016-06-043-34/+138
* | | Merge branch 'fix/rubocop-offense-in-specs' into 'master' Grzegorz Bizon2016-06-061-3/+2
|\ \ \ | |_|/ |/| |
| * | Fix rubocop offense in awardable specsfix/rubocop-offense-in-specsGrzegorz Bizon2016-06-061-3/+2
|/ /
* | Merge branch 'rubocop/enable-ambiguous-operator-rubocop-lint' into 'master' Robert Speicher2016-06-054-8/+8
|\ \
| * | Enable Lint/AmbiguousOperator rubocop coprubocop/enable-ambiguous-operator-rubocop-lintGrzegorz Bizon2016-06-034-8/+8
* | | Fix CHANGELOG for 8.8.4 (unreleased)Robert Speicher2016-06-051-4/+2
* | | Merge branch 'documentation-for-build-trace' into 'master' Achilleas Pipinellis2016-06-041-0/+24
|\ \ \
| * | | Document the API endpoint for gathering a build logMark Fletcher2016-06-031-0/+24
* | | | Merge branch 'fix-design-link-in-contributing' into 'master' Achilleas Pipinellis2016-06-041-2/+2
|\ \ \ \
| * | | | Fix link to current design reference in the CONTRIBUTING guidefix-design-link-in-contributingRémy Coutable2016-06-021-2/+2
* | | | | Merge branch 'issue_13499' into 'master' Jacob Schatz2016-06-0421-133/+776
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove extra bracketissue_13499Alfredo Sumaran2016-06-031-2/+1
| * | | | Fix specAlfredo Sumaran2016-06-032-7/+8
| * | | | Address feedbackAlfredo Sumaran2016-06-039-32/+26
| * | | | Update CHANGELOGAlfredo Sumaran2016-06-031-2/+1
| * | | | Spec label add / delete in UpdateServiceSean McGivern2016-06-032-9/+54
| * | | | Allow bulk-updating to remove all labelsSean McGivern2016-06-032-1/+9
| * | | | Update CHANGELOGAlfredo Sumaran2016-06-033-2/+3
| * | | | EnhancementsAlfredo Sumaran2016-06-034-23/+25
| * | | | Update CHANGELOGAlfredo Sumaran2016-06-031-0/+1
| * | | | Fix specAlfredo Sumaran2016-06-031-8/+9
| * | | | Respond to .json onlyAlfredo Sumaran2016-06-031-1/+6
| * | | | Fix specAlfredo Sumaran2016-06-031-1/+1
| * | | | Add mising paramsAlfredo Sumaran2016-06-031-3/+6
| * | | | Fix failing specsAlfredo Sumaran2016-06-031-6/+8
| * | | | Bulk assignment testsAlfredo Sumaran2016-06-031-38/+120
| * | | | Remove console.logAlfredo Sumaran2016-06-031-1/+0
| * | | | Bulk assignment implementationAlfredo Sumaran2016-06-033-2/+111
| * | | | Tweaks for bulk assignmentAlfredo Sumaran2016-06-031-3/+15
| * | | | Expose Issue IDAlfredo Sumaran2016-06-031-1/+1
| * | | | Expose label IDAlfredo Sumaran2016-06-031-1/+1
| * | | | Add show_create param to toggle label creation optionAlfredo Sumaran2016-06-031-2/+2
| * | | | Add show_footer parameter for ability to hide footerAlfredo Sumaran2016-06-032-1/+3
| * | | | Do not trigger keyup event if we are persisting stateAlfredo Sumaran2016-06-031-3/+8