summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Modify GithubImport to support GiteaRémy Coutable2016-12-197-141/+143
* Rename Gogs to Gitea, DRY the controller and improve viewsRémy Coutable2016-12-194-66/+3
* Gogs ImporterKim "BKC" Carlbäcker2016-12-1910-21/+96
* Merge branch 'fix/import-export-build-token' into 'master' Grzegorz Bizon2016-12-191-0/+2
|\
| * Fix duplicated build token problem and added relevant specfix/import-export-build-tokenJames Lopez2016-12-191-0/+2
* | Merge branch 'fix/detailed-status-groups' into 'master' Lin Jen-Shin (godfat)2016-12-194-10/+11
|\ \
| * | Improve how we calculate detailed status group nameGrzegorz Bizon2016-12-161-1/+1
| * | Update status group name for success with warningsGrzegorz Bizon2016-12-161-1/+1
| * | Make CI/CD detailed status group concept explicitGrzegorz Bizon2016-12-163-8/+9
* | | Merge branch '25301-git-2.11-force-push-bug' into 'master' Douglas Barbosa Alexandre2016-12-195-9/+58
|\ \ \ | |_|/ |/| |
| * | Implement final review comments from @rymai.25301-git-2.11-force-push-bugTimothy Andrew2016-12-162-7/+9
| * | Implement review comments from @dbalexandre.Timothy Andrew2016-12-161-10/+12
| * | Check the exit code while invoking git in the force push check.Timothy Andrew2016-12-161-2/+7
| * | Validate environment variables in `Gitlab::Git::RevList`Timothy Andrew2016-12-161-3/+13
| * | Accept environment variables from the `pre-receive` script.Timothy Andrew2016-12-165-8/+38
| |/
* | Merge remote-tracking branch 'origin/master' into dockerfile-templatesdockerfile-templatesKamil Trzcinski2016-12-18120-625/+2586
|\ \
| * \ Merge branch '25741_enable_multiline_operation_indentation_rubocop_rule' into...Sean McGivern2016-12-171-1/+1
| |\ \
| | * | Enable Style/MultilineOperationIndentation in Rubocop, fixes #25741Rydkin Maxim2016-12-161-1/+1
| | |/
| * | Fix import issues methodDouglas Barbosa Alexandre2016-12-161-4/+4
| * | Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-1611-13/+194
| |\ \ | | |/
| | * Rename the `token_has_scope?` method.Timothy Andrew2016-12-161-3/+3
| | * Convert AccessTokenValidationService into a class.Timothy Andrew2016-12-161-1/+1
| | * Refactor access token validation in `Gitlab::Auth`Timothy Andrew2016-12-161-2/+10
| | * Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-161-1/+0
| | * Validate access token scopes in `Gitlab::Auth`Timothy Andrew2016-12-161-3/+11
| | * Calls to the API are checked for scope.Timothy Andrew2016-12-161-0/+4
| | * Merge branch 'katex-math-fixup' into 'master' Sean McGivern2016-12-161-4/+0
| | |\
| | | * Don't open Asciidoc module twiceMunken2016-12-151-4/+0
| | * | Merge branch '25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs...Kamil Trzciński2016-12-151-1/+1
| | |\ \
| | | * | Rename `issue create` slash command to `issue new`25144-gitlab-ce-mattermost-slash-command-for-issue-create-needs-better-documentationPedro Moreira da Silva2016-12-151-1/+1
| | | * | Improve `issue create …` slash command with user input keys to create a new...Pedro Moreira da Silva2016-12-151-1/+1
| | * | | Merge branch 'show-commit-status-from-latest-pipeline' into 'master' Grzegorz Bizon2016-12-151-2/+2
| | |\ \ \
| | | * | | Also use latest_status, feedback:Lin Jen-Shin2016-12-151-2/+1
| | | * | | Merge remote-tracking branch 'upstream/master' into show-commit-status-from-l...Lin Jen-Shin2016-12-1416-43/+284
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'upstream/master' into show-commit-status-from-l...Lin Jen-Shin2016-12-1432-30/+406
| | | |\ \ \ \
| | | * | | | | Use Ci::Pipeline#latest for finding pipelinesLin Jen-Shin2016-11-241-1/+2
| | * | | | | | Merge branch '22864-add-clean-environment-name' into 'master' Kamil Trzciński2016-12-151-0/+9
| | |\ \ \ \ \ \
| | | * | | | | | Add an environment slugNick Thomas2016-12-151-0/+9
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-152-4/+2
| | * | | | | | Merge branch 'katex-math' into 'master' Sean McGivern2016-12-152-1/+32
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-142-1/+32
| | * | | | | Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-153-2/+122
| | * | | | | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-141-0/+8
| | | |_|_|/ | | |/| | |
| * | | | | Fix rubucop offensesbitbucket-oauth2Douglas Barbosa Alexandre2016-12-161-27/+27
| * | | | | BB importer: Adressed more review commentsValery Sizov2016-12-161-15/+19
| * | | | | BB importer: address review commentValery Sizov2016-12-161-6/+4
| * | | | | BB importer: Milestone importerValery Sizov2016-12-161-0/+2
| * | | | | BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov2016-12-151-1/+1
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2Valery Sizov2016-12-1416-43/+284
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'build-statuses' into 'master' Rémy Coutable2016-12-1416-43/+284
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
View Lorry Controller Status