summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'restrict-haml-javascript' into 'master'Tim Zallmann2017-08-072-0/+15
|\
| * Add custom linter for inline JavaScript to haml_lint (!9742)winniehell2017-08-072-0/+15
* | Merge branch '32300__expose_more_attributes' into 'master'Rémy Coutable2017-08-071-14/+11
|\ \ | |/ |/|
| * Expose more attributes to unauthenticated GET /projects/:idTony2017-08-031-14/+11
* | Add Korean translation to i18nHuang Tao2017-08-071-1/+2
* | Merge branch 'mattermost_fixes' into 'master'Sean McGivern2017-08-071-6/+20
|\ \
| * | Fix Mattermost integrationmattermost_fixesValery Sizov2017-08-041-6/+20
* | | Merge branch 'gitaly-renames-annotations' into 'master'Sean McGivern2017-08-072-84/+5
|\ \ \
| * | | Migration link for Repository#logJacob Vosmaer2017-08-031-0/+1
| * | | Remove unused methodsJacob Vosmaer2017-08-031-77/+0
| * | | Remove unnecessary 'raw' aliasJacob Vosmaer2017-08-031-5/+0
| * | | Rename 'commits_between' to 'rugged_commits_between'Jacob Vosmaer2017-08-032-2/+4
* | | | Merge branch '27616-fix-contributions-graph-utc-offset-mysql' into 'master'Tim Zallmann2017-08-061-4/+10
|\ \ \ \
| * | | | fix rubocop violations 👮Mike Greiling2017-07-311-4/+4
| * | | | fix mysql syntax for date INTERVAL arithmaticMike Greiling2017-07-311-3/+7
| * | | | adjust timezone for date grouping in contributions calendarMike Greiling2017-07-291-2/+4
| * | | | use timezone-aware Date.current instead of Date.today in ContributionsCalenda...Mike Greiling2017-07-291-2/+2
* | | | | Merge branch 'feature/migrate-last-commit-for-path-to-gitaly' into 'master'Robert Speicher2017-08-042-0/+19
|\ \ \ \ \
| * | | | | Migrate Repository#last_commit_for_path to GitalyAhmad Sherif2017-08-032-8/+27
* | | | | | Merge branch 'feature/migrate-load-blame-to-gitaly' into 'master'Robert Speicher2017-08-043-14/+37
|\ \ \ \ \ \
| * | | | | | Migrate blame loading to Gitalyfeature/migrate-load-blame-to-gitalyAhmad Sherif2017-08-033-14/+37
| |/ / / / /
* | | | | | Merge branch 'refactor.notification-recipient-builders' into 'master'Sean McGivern2017-08-041-4/+10
|\ \ \ \ \ \
| * | | | | | declarative_policy rubocop fixhttp://jneen.net/2017-08-031-2/+3
| * | | | | | short-circuit if there is no policy, and add :read_project checkhttp://jneen.net/2017-08-031-4/+9
| |/ / / / /
* | | | | | Don't bother going through an entire Banzai pipeline for empty textrs-minor-banzai-perfRobert Speicher2017-08-031-0/+2
* | | | | | Merge branch 'tc-no-todo-service-select-mysql' into 'master'Sean McGivern2017-08-032-6/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-032-6/+6
* | | | | | Merge branch 'feature/migrate-count-commits-to-gitaly' into 'master'Robert Speicher2017-08-032-11/+27
|\ \ \ \ \ \
| * | | | | | Migrate Gitlab::Git::Repository#count_commits to Gitalyfeature/migrate-count-commits-to-gitalyAhmad Sherif2017-08-022-11/+27
* | | | | | | Merge branch 'merge-request-commits-background-migration' into 'master'Rémy Coutable2017-08-031-0/+107
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Migrate MR commits and diffs to new tablesmerge-request-commits-background-migrationSean McGivern2017-08-031-0/+107
* | | | | | | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-032-1/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Check against "Auto-Submitted: no" insteadLin Jen-Shin2017-08-031-2/+11
| * | | | | | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mailsLin Jen-Shin2017-08-032-1/+4
* | | | | | | Merge branch 'fix-gitaly-install' into 'master'Rémy Coutable2017-08-031-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Ensure we run installation Rake tasks in a clean env in TestEnvRémy Coutable2017-08-021-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'dm-api-current-user' into 'master'Sean McGivern2017-08-032-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Do not validate CSRF token in API unless neededdm-api-current-userDouwe Maan2017-08-022-1/+3
| | |_|/ / | |/| | |
* | | | | Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master'Rémy Coutable2017-08-021-2/+7
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Uniquify reserved word usernames on OAuth user creationRobin Bobbitt2017-08-021-2/+7
* | | | | Merge branch 'api_project_events_target_iid' into 'master'Rémy Coutable2017-08-021-1/+1
|\ \ \ \ \
| * | | | | Expose target_iid in Events APIsue4452017-08-021-1/+1
* | | | | | Extending API for protected branchesEric2017-08-024-3/+104
* | | | | | Merge branch 'rugged-is-ancestor' into 'master'Sean McGivern2017-08-021-0/+7
|\ \ \ \ \ \
| * | | | | | Add rugged_is_ancestor methodJacob Vosmaer2017-08-011-0/+7
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'pawel/add_more_variables_to_additional_metrics-35267' into 'mas...Douwe Maan2017-08-023-21/+28
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove default arguments for common query contextpawel/add_more_variables_to_additional_metrics-35267Pawel Chojnacki2017-08-012-2/+4
| * | | | | Move timeframe_start and timeframe_end to common query contextPawel Chojnacki2017-08-013-14/+8
| * | | | | Give metric query context rspec examples correctly sounding names. + missing ...Pawel Chojnacki2017-08-011-0/+1
| * | | | | Context handling and tests cleanup + simple test kube_namespace context testPawel Chojnacki2017-07-311-11/+9
View Lorry Controller Status