summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'integer_migration_style' into 'master' Yorick Peterse2016-09-161-2/+8
|\
| * Add support for column limits in add_column_with_defaultDrew Blessing2016-09-151-2/+8
* | Syntax fixes and better tests for helper methods. Updated docs.group-specific-lfs-settingsPatricio Cano2016-09-151-2/+4
* | Added group-specific setting for LFS.Patricio Cano2016-09-152-3/+5
|/
* Merge branch 'fix-old-migration-repos-path-key' into 'master' Robert Speicher2016-09-151-4/+0
|\
| * Update references to deprecated `repos_path` configuration key to avoidfix-old-migration-repos-path-keyAlejandro Rodríguez2016-09-141-4/+0
* | Clean environment variables when running git hooksfix_custom_hook_envsValery Sizov2016-09-151-5/+7
|/
* Merge branch 'houqp-master' into 'master' Robert Speicher2016-09-141-0/+1
|\
| * Fix URLs with anchors in wikiQingping Hou2016-09-131-0/+1
* | Merge branch 'fix/gitlab-popen-thread-safety' into 'master' Stan Hu2016-09-141-6/+6
|\ \
| * | Fix Gitlab::Popen.popen thread-safety issuefix/gitlab-popen-thread-safetyAhmad Sherif2016-09-131-6/+6
* | | Merge branch 'workhorse-secret-trailing-newline' into 'master' Stan Hu2016-09-131-1/+1
|\ \ \
| * | | Allow trailing newline in secret base64 dataJacob Vosmaer2016-09-131-1/+1
| | |/ | |/|
* | | Merge branch 'rc-use-haml_lint' into 'master' Robert Speicher2016-09-131-0/+5
|\ \ \ | |_|/ |/| |
| * | Improve .haml-lint.yml, simplify the haml_lint task and remove CHANGELOG entryrc-use-haml_lintRémy Coutable2016-09-131-4/+1
| * | Add haml_lint rake taskRémy Coutable2016-09-131-0/+8
* | | Merge branch 'feature/builds-register-change-404-to-204' into 'master' Rémy Coutable2016-09-133-1/+13
|\ \ \ | |_|/ |/| |
| * | Change response for /ci/api/v1/builds/register.json from 404 to 204Tomasz Maczukin2016-09-133-1/+13
* | | Merge branch 'patch-4' into 'master' Robert Speicher2016-09-131-1/+1
|\ \ \
| * | | update gitlab shell secret file also when it is emptyElan Ruusamäe2016-09-131-1/+1
| | |/ | |/|
* | | Merge branch '20780-import-github-release-notes' into 'master' Robert Speicher2016-09-132-0/+36
|\ \ \ | |_|/ |/| |
| * | Import GitHub release notesAndrew Smith2016-09-132-0/+36
| |/
* | Avoid protected branches checks when verifying access without branch namePaco Guzman2016-09-131-0/+1
* | Merge branch 'fix-commit-status' into 'master' Rémy Coutable2016-09-131-26/+28
|\ \ | |/ |/|
| * Fix an error where we were unable to create a CommitStatus for running statefix-commit-statusKamil Trzcinski2016-09-121-26/+28
* | Merge branch '21569-dont-add-created-by-for-matched-users' into 'master' Robert Speicher2016-09-124-6/+23
|\ \ | |/ |/|
| * Only add the original author if there isn't a linked GitLab accountAndrew Smith2016-09-084-6/+23
* | Merge branch 'rc-api-use-search-globalservice-in-projects-search-api' into 'm...Rémy Coutable2016-09-121-12/+3
|\ \
| * | Use Search::GlobalService.new in the `GET /projects/search/:query` endpointrc-api-use-search-globalservice-in-projects-search-apiRémy Coutable2016-09-121-12/+3
| * | Search should compare only the lowercase versions of the project namesRazzeee2016-09-091-1/+1
* | | Merge branch 'fix-api-sorting' into 'master' Douwe Maan2016-09-121-3/+9
|\ \ \
| * | | Fix API issues sortingfix-api-sortingSean McGivern2016-09-091-3/+9
| |/ /
* | | Merge branch '19359-api-for-notification-settings' into 'master' Rémy Coutable2016-09-123-1/+114
|\ \ \
| * | | Add notification_settings API callsMarc Siegfriedt2016-09-093-1/+114
* | | | Merge branch 'restrict_ldap_return_attributes' into 'master' Robert Speicher2016-09-091-25/+33
|\ \ \ \ | |/ / / |/| | |
| * | | Request only the LDAP attributes we needDrew Blessing2016-09-091-25/+33
* | | | Avoid conflict with admin labels when importing GitHub labelsDouglas Barbosa Alexandre2016-09-092-2/+7
| |/ / |/| |
* | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-092-3/+53
|\ \ \ | |/ / |/| |
| * | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-052-3/+53
* | | Merge branch 'smart-pipeline-duration' into 'master' Rémy Coutable2016-09-081-0/+141
|\ \ \
| * | | Struct.new could take a block for defining methods, feedback:smart-pipeline-durationLin Jen-Shin2016-09-081-2/+1
| * | | Split try_merge_period into overlap? and merge:Lin Jen-Shin2016-09-081-7/+9
| * | | Be more specific since it's not needed to be generic now,Lin Jen-Shin2016-09-061-3/+5
| * | | Sort by database, feedback:Lin Jen-Shin2016-09-061-2/+4
| * | | Just use module because there's nothing to save, feedback:Lin Jen-Shin2016-09-061-14/+10
| * | | Use sum, feedback:Lin Jen-Shin2016-09-061-3/+1
| * | | Forget about pending duration for now, need more discussionLin Jen-Shin2016-09-051-39/+10
| * | | Just sum all the queuing time, indication for needing more runnersLin Jen-Shin2016-09-021-6/+7
| * | | Actually we still need to use total - running to get:Lin Jen-Shin2016-09-021-3/+4
| * | | Merge remote-tracking branch 'upstream/master' into smart-pipeline-durationLin Jen-Shin2016-09-0228-124/+229
| |\ \ \
View Lorry Controller Status