summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Avoid use of Hash#dig to keep compatibility with Ruby 2.1Douglas Barbosa Alexandre2016-12-164-10/+10
* Fix import issues methodDouglas Barbosa Alexandre2016-12-161-4/+4
* Merge remote-tracking branch 'origin/master' into bitbucket-oauth2Douglas Barbosa Alexandre2016-12-1622-37/+372
|\
| * Merge branch '20492-access-token-scopes' into 'master' Rémy Coutable2016-12-165-25/+72
| |\
| | * Rename the `token_has_scope?` method.Timothy Andrew2016-12-161-3/+3
| | * Convert AccessTokenValidationService into a class.Timothy Andrew2016-12-162-3/+3
| | * Refactor access token validation in `Gitlab::Auth`Timothy Andrew2016-12-161-2/+10
| | * Implement minor changes from @dbalexandre's review.Timothy Andrew2016-12-162-12/+15
| | * Validate access token scopes in `Gitlab::Auth`Timothy Andrew2016-12-161-3/+11
| | * Calls to the API are checked for scope.Timothy Andrew2016-12-165-30/+58
| * | Merge branch 'issue_22269' into 'master' Kamil Trzciński2016-12-161-1/+9
| |\ \ | | |/ | |/|
| | * Change SlackService to SlackNotificationsServiceissue_22269_fix_eeissue_22269Felipe Artur2016-12-151-1/+9
| * | 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-1479-1121/+2212
| | |\ \ \ \
| | * | | | | 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-154-1/+27
| |\ \ \ \ \ \
| | * | | | | | Add an environment slugNick Thomas2016-12-154-1/+27
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'jej-note-search-uses-finder' into 'security' Douwe Maan2016-12-152-4/+2
| * | | | | | Merge branch 'katex-math' into 'master' Sean McGivern2016-12-155-1/+105
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Render math in Asciidoc and Markdown with KaTeX using code blocksMunken2016-12-147-35/+87
| | * | | | Better location for math lexerMunken2016-12-082-22/+21
| | * | | | Removed alias and filenamesMunken2016-12-081-2/+0
| | * | | | Hacked in Math LexerMunken2016-12-081-0/+27
| | * | | | Math works for inline syntaxMunken2016-12-081-2/+0
| | * | | | Working inline math filterMunken2016-12-082-0/+30
| * | | | | Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-153-2/+122
| * | | | | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-142-0/+36
| | |_|_|/ | |/| | |
* | | | | 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-162-0/+6
* | | | | BB importer: Fixed bug with putting expired token to a project.clone_urlValery Sizov2016-12-153-5/+5
* | | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Remove trailing blank line from Allowable moduleGrzegorz Bizon2016-12-141-1/+0
| | * | | Make it possible to mix `Gitlab::Routing` inGrzegorz Bizon2016-12-132-1/+7
| | * | | Extract abilities checking module from ability modelGrzegorz Bizon2016-12-132-1/+9
| | * | | Refine build stop/play extended status specsGrzegorz Bizon2016-12-131-4/+4
| | * | | Use manual build icon in play/stop build statusesGrzegorz Bizon2016-12-132-4/+12
| | * | | Add specs for build stop extended detailed statusGrzegorz Bizon2016-12-121-4/+0
| | * | | Fix build stop extended status CSS classGrzegorz Bizon2016-12-121-4/+0
| | * | | Fix path to build status details in common helpersGrzegorz Bizon2016-12-121-1/+1
| | * | | Add action_class/action_titleKamil Trzcinski2016-12-125-3/+30