summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'artifacts-from-ref-and-build-name' into 'master' Douwe Maan2016-08-301-3/+1
|\
| * Merge remote-tracking branch 'upstream/master' into artifacts-from-ref-and-bu...Lin Jen-Shin2016-08-2614-148/+115
| |\
| * | Fix testsLin Jen-Shin2016-08-261-3/+1
* | | Rename CI config hidden job entry to hidden entryGrzegorz Bizon2016-08-292-2/+2
* | | Do not enforce using a hash with hidden ci keyGrzegorz Bizon2016-08-291-1/+0
| |/ |/|
* | Merge branch 'reduce-contributions-calendar-payload' into 'master' Jacob Schatz2016-08-261-1/+0
|\ \
| * | Reduce contributions calendar data payloadClement Ho2016-08-251-1/+0
* | | Merge branch '21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-...Robert Speicher2016-08-251-0/+9
|\ \ \
| * | | Handle non-UTF-8 conflicts gracefully21247-mergerequestscontroller-conflicts-may-fail-with-iso-8859-dataSean McGivern2016-08-251-0/+9
* | | | Merge branch '21275-getting-500-error-when-viewing-a-merge-request'Douwe Maan2016-08-251-0/+11
|\ \ \ \
| * | | | Handle case where conflicts aren't on disk yetSean McGivern2016-08-251-0/+11
| |/ / /
* | | | Merge branch 'zj-remove-gitorious' into 'master' Douwe Maan2016-08-256-104/+7
|\ \ \ \
| * | | | Remove gitoriouszj-remove-gitoriousZ.J. van de Weg2016-08-256-104/+7
| |/ / /
* | | | Merge branch 'dz-merge-request-version'Douwe Maan2016-08-251-8/+8
|\ \ \ \
| * \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-225-10/+17
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into dz-merge-request-versionDmitriy Zaporozhets2016-08-1940-172/+1299
| |\ \ \ \ \
| * | | | | | Make merge request diff works with new FileCollection logicDmitriy Zaporozhets2016-08-151-8/+8
* | | | | | | Adds response mime type to transaction metric action when it's not HTMLPaco Guzman2016-08-251-2/+20
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'github-importer' into 'master' Douwe Maan2016-08-242-33/+58
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add readable error message when remote data could not be fully importedDouglas Barbosa Alexandre2016-08-241-1/+6
| * | | | | Does not halt the GitHub import process when an error occursDouglas Barbosa Alexandre2016-08-242-33/+53
| | |_|_|/ | |/| | |
* | | | | url_builder: handle project snippetsBen Boeckel2016-08-241-0/+2
|/ / / /
* | | | Merge branch 'metrics-typo' into 'master' Yorick Peterse2016-08-221-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix typo in gitlab-workhorse headerJacob Vosmaer2016-08-191-1/+1
* | | | Merge branch 'disable-issue-by-email' into 'master' Robert Speicher2016-08-201-1/+2
|\ \ \ \
| * | | | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+2
* | | | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-191-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-191-0/+1
* | | | | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher2016-08-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-201-2/+1
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1915-15/+698
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-191-5/+0
| * | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1722-152/+528
| |\ \ \ \ \
| * | | | | | Introduce Gitlab::Utils.now so that it's easier to stubLin Jen-Shin2016-08-151-1/+6
* | | | | | | Merge branch '20895-inline-comments-for-first-commit' into 'master' Douwe Maan2016-08-191-6/+12
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Fix line commenting for the initial commitSean McGivern2016-08-191-6/+12
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'fix/improve-test-coverage-badge-pipelines' into 'master' Douwe Maan2016-08-191-2/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Render coverage badge for latest successful pipelineGrzegorz Bizon2016-08-181-2/+1
| | |_|/ / | |/| | |
* | | | | Merge branch '2fa-check-git-http' into 'master' Robert Speicher2016-08-181-6/+38
|\ \ \ \ \
| * | | | | Refactor `find_for_git_client` and its related methods.2fa-check-git-httpPatricio Cano2016-08-181-20/+25
| * | | | | Refactor `find_for_git_client` method to not use assignment in conditionals a...Patricio Cano2016-08-171-13/+25
| * | | | | Moved 2FA check to `auth.rb` and cleaned up the flow `authenticate_user`Patricio Cano2016-08-161-2/+8
| * | | | | Allow Git over HTTP access using Personal Access TokensPatricio Cano2016-08-161-0/+9
* | | | | | Merge branch '4273-slash-commands' into 'master'Robert Speicher2016-08-184-0/+278
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix behavior around commands with optional arguments4273-slash-commandsDouwe Maan2016-08-182-11/+13
| * | | | | Address feedbackDouwe Maan2016-08-172-17/+16
| * | | | | Fix specs and implement fixes based on failing specsDouwe Maan2016-08-172-9/+17
| * | | | | Merge branch 'master' into 4273-slash-commandsDouwe Maan2016-08-1626-158/+602
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Fixed specs and fixes based on failing specsDouwe Maan2016-08-163-16/+12
| * | | | | Refactor slash command definitionDouwe Maan2016-08-123-72/+97
View Lorry Controller Status