summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Use `scripts/merge-simplecov`Kamil Trzcinski2016-07-211-63/+0
* Merge coverage reportKamil Trzcinski2016-07-211-0/+63
* Merge branch 'email-domain-blacklist' into 'master' Robert Speicher2016-07-202-2/+4
|\
| * Refactor and rename `restricted_signup_domains` to `domain_whitelist` to bett...Patricio Cano2016-07-182-2/+2
| * Added the ability to block sign ups using a domain blacklist.Patricio Cano2016-07-181-0/+2
* | Change `return`s for `next`s to please rubocop (behaviour is the same)Alejandro Rodríguez2016-07-201-2/+2
* | Add /deploy_keys API to retrieve all deploy keys regardless of project affili...Alejandro Rodríguez2016-07-201-53/+66
* | Merge branch 'migration-downtime-tags' into 'master' Robert Speicher2016-07-204-0/+140
|\ \
| * | Added checks for migration downtimemigration-downtime-tagsYorick Peterse2016-07-204-0/+140
* | | Merge branch 'rubocop/enable-multiline-ternary-operator-cop' into 'master' Robert Speicher2016-07-201-2/+1
|\ \ \
| * | | Enable Style/MultilineTernaryOperator rubocop coprubocop/enable-multiline-ternary-operator-copGrzegorz Bizon2016-07-201-2/+1
* | | | Use limit parameter rather than hardcoded valueM. Ricketts2016-07-201-1/+1
* | | | Ensure to_json methods take optional argumentSean McGivern2016-07-202-4/+4
* | | | Merge branch 'remove-parse-boolean' into 'master' Rémy Coutable2016-07-204-8/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Replace parse_boolean with to_booleanRobert Schilling2016-07-204-8/+4
| |/ /
* | | Limit git rev-list output count to one in forced push checkAhmad Sherif2016-07-191-2/+2
* | | Fix help page paths to make sure shortcuts and the UI help page work.fix-help-pathsConnor Shea2016-07-191-1/+1
* | | Merge branch 'allow-deploy-key-to-download-public-projects' into 'master' Rémy Coutable2016-07-191-0/+1
|\ \ \
| * | | Allow to pull code with deploy key from public projectsallow-deploy-key-to-download-public-projectsKamil Trzcinski2016-07-191-0/+1
* | | | Merge branch 'fix/import-export-project-avatar' into 'master' Rémy Coutable2016-07-195-7/+78
|\ \ \ \
| * | | | squashed - added avatar saver/restorer and specsfix/import-export-project-avatarJames Lopez2016-07-195-7/+78
| | |/ / | |/| |
* | | | Improve code designKamil Trzcinski2016-07-191-1/+1
* | | | Fix broken builds_for_refKamil Trzcinski2016-07-191-1/+1
* | | | Use value of `yaml_variables` and `when` from config_processor if undefinedKamil Trzcinski2016-07-191-32/+33
* | | | Merge branch 'manual-actions' into 'master' Rémy Coutable2016-07-191-2/+2
|\ \ \ \
| * | | | Add implementation of manual actionsKamil Trzcinski2016-07-181-2/+2
* | | | | Merge branch 'api-cleanup-entities' into 'master' Rémy Coutable2016-07-192-42/+21
|\ \ \ \ \
| * | | | | Simplify entities for branches and tags APIapi-cleanup-entitiesRobert Schilling2016-07-192-42/+21
| | |/ / / | |/| | |
* | | | | Merge branch 'deployment-tracking' into 'master' Rémy Coutable2016-07-191-0/+9
|\ \ \ \ \
| * | | | | Added Rake task for tracking deploymentsdeployment-trackingYorick Peterse2016-07-191-0/+9
* | | | | | Merge branch 'api-delete-todos' into 'master' Rémy Coutable2016-07-191-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Return the number of marked todosapi-delete-todosRobert Schilling2016-07-191-1/+1
* | | | | | Merge branch 'api-dev-can-push' into 'master' Rémy Coutable2016-07-193-4/+36
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Only update onceRobert Schilling2016-07-191-2/+3
| * | | | | API: Expose 'developers_can_merge' for branchesRobert Schilling2016-07-192-1/+11
| * | | | | API: Expose 'developers_can_push' for branchesRobert Schilling2016-07-193-4/+25
* | | | | | Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-193-2/+11
|/ / / / /
* | | | | Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-182-23/+18
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-182-23/+18
* | | | | Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-5/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-5/+1
* | | | | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-189-136/+213
|\ \ \ \ \
| * | | | | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-189-136/+213
* | | | | | Merge branch '18593-avoid-parse_html-when-rinku-didnt-do-anything' into 'mast...Yorick Peterse2016-07-181-0/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Don't parse Rinku returned value to DocFragment when it didn't change the ori...18593-avoid-parse_html-when-rinku-didnt-do-anythingPaco Guzman2016-07-181-0/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'store-variables-and-when-in-builds-table' into 'master' Rémy Coutable2016-07-181-15/+38
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into store-variables...store-variables-and-when-in-builds-tableKamil Trzcinski2016-07-1816-227/+116
| |\ \ \ \ \
| * | | | | | Store when and yaml variables in builds tableKamil Trzcinski2016-07-161-15/+38
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'docker-registry-work-with-redirect' into 'master' Rémy Coutable2016-07-182-21/+50
|\ \ \ \ \ \
| * | | | | | Make rubocop happyKamil Trzcinski2016-07-151-1/+1