Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | refactor(email): use setter method instead AR callbacks | Semyon Pupkov | 2016-10-23 | 3 | -4/+8 |
* | Merge branch 'sh-fix-broken-label-controller' into 'master' | Rémy Coutable | 2016-10-22 | 3 | -1/+19 |
|\ | |||||
| * | Fix status code expectation | Rémy Coutable | 2016-10-22 | 1 | -1/+1 |
| * | Fix error in generating labelssh-fix-broken-label-controller | Stan Hu | 2016-10-22 | 3 | -1/+19 |
* | | Merge branch '23653-dont-clear-db-cache-every-release' into 'master' | Yorick Peterse | 2016-10-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Stop clearing the database cache on rake cache:clear | Nick Thomas | 2016-10-22 | 1 | -1/+1 |
* | | | Merge branch '23146_19131_build-api_scope-doc' into 'master' | Rémy Coutable | 2016-10-22 | 3 | -6/+7 |
|\ \ \ | |||||
| * | | | Fix documents and comments on Build API `scope`. #23146 #19131 | Lemures Lemniscati | 2016-10-22 | 3 | -6/+7 |
* | | | | Merge branch 'patch-3' into 'master' | Rémy Coutable | 2016-10-22 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Fix docker.sock reference in config.toml | Niels Keurentjes | 2016-07-10 | 1 | -1/+1 |
* | | | | Merge branch 'ldap-login-styles' into 'master' | Jacob Schatz | 2016-10-22 | 3 | -3/+35 |
|\ \ \ \ | |||||
| * | | | | Ensure custom provider tab labels don't break layout.ldap-login-styles | Bryce Johnson | 2016-10-20 | 3 | -3/+35 |
* | | | | | Merge branch '22892-cycle-analytics-date-filter-is-not-working' into 'master' | Fatih Acet | 2016-10-22 | 2 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Update CHANGELOG22892-cycle-analytics-date-filter-is-not-working | Alfredo Sumaran | 2016-10-21 | 1 | -0/+1 |
| * | | | | | Fix object data to be sent to fetch analytics data | Alfredo Sumaran | 2016-10-21 | 1 | -1/+5 |
* | | | | | | Merge branch 'docs/dynamic-envs-yaml' into 'master' | Achilleas Pipinellis | 2016-10-22 | 1 | -25/+135 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Refactor and add new functionality to CI yaml referencedocs/dynamic-envs-yaml | Achilleas Pipinellis | 2016-10-20 | 1 | -25/+135 |
* | | | | | | Merge branch 'sh-add-mailers-to-sidekiq-config' into 'master' v8.14.0.pre | Stan Hu | 2016-10-22 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix bug where e-mails were not being sent out via Sidekiq | Stan Hu | 2016-10-21 | 1 | -0/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'fix-example-in-api-documentation' into 'master' | Rémy Coutable | 2016-10-22 | 2 | -4/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix wrong endpoint in api/users documentation, fix same typo in spec describe... | Airat Shigapov | 2016-10-21 | 2 | -4/+4 |
* | | | | | | | Merge branch 'project-settings--features-weight' into 'master' | Annabel Dunstone Gray | 2016-10-21 | 2 | -60/+72 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fix font weight of project feature settingsproject-settings--features-weight | tauriedavis | 2016-10-20 | 2 | -60/+72 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'separate-sidekiq-queues' into 'master' | Douwe Maan | 2016-10-21 | 62 | -68/+425 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Re-organize queues to use for Sidekiqseparate-sidekiq-queues | Yorick Peterse | 2016-10-21 | 62 | -68/+425 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'patch-6' into 'master' | Rémy Coutable | 2016-10-21 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Grammar fixes in docs | Wilfred Hughes | 2016-10-03 | 1 | -3/+3 |
* | | | | | | | | Merge branch 'patch-6' into 'master' | Rémy Coutable | 2016-10-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Changed gitlab-shell version to avoid warning when precompiling the assets. | Ismael Arenzana | 2016-10-07 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'fix-bulk-assign-issues-for-external-issues' into 'master' | Sean McGivern | 2016-10-21 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Ignore external issues when bulk assigning issues to author of merge request.fix-bulk-assign-issues-for-external-issues | Adam Niedzielski | 2016-10-20 | 2 | -1/+13 |
* | | | | | | | | | Merge branch 'adam-fix-group-web-url' into 'master' | Sean McGivern | 2016-10-21 | 3 | -16/+25 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Change "Group#web_url" to return "/groups/twitter" rather than "/twitter". | Adam Niedzielski | 2016-10-21 | 3 | -16/+25 |
* | | | | | | | | | | Merge branch 'bugfix/add_hover_to_trash_icon' into 'master' | Annabel Dunstone Gray | 2016-10-21 | 2 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add hover to trash icon in notes | blackst0ne | 2016-10-21 | 2 | -1/+2 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'compare-ellipsis-line' into 'master' | Fatih Acet | 2016-10-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed compare ellipsis messing with layout | Phil Hughes | 2016-10-21 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'runners-paginate' into 'master' | Rémy Coutable | 2016-10-21 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix error 500 on Runners page. | Libor Klepáč | 2016-08-08 | 3 | -3/+3 |
* | | | | | | | | | | | | Merge branch 'fixed-mr-tabs-fixes' into 'master' | Fatih Acet | 2016-10-21 | 4 | -48/+62 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Fixed issue when images are loading it would push off the tabsfixed-mr-tabs-fixes | Phil Hughes | 2016-10-20 | 1 | -2/+8 |
| * | | | | | | | | | | | Fixed issues with sticky mr tabs & sidebar | Phil Hughes | 2016-10-20 | 4 | -46/+54 |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fix_project_member_access_levels' into 'master' | Sean McGivern | 2016-10-21 | 5 | -1/+64 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Fix project member access levelsfix_project_member_access_levels | Valery Sizov | 2016-10-21 | 5 | -1/+64 |
* | | | | | | | | | | | Merge branch 'master' into 'master' | Rémy Coutable | 2016-10-21 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Replace builds_emails_service.png to fit to new layout of GitLab | Christian Meter | 2016-07-07 | 1 | -0/+0 |
* | | | | | | | | | | | | Merge branch 'sh-fix-label-uniquness-migration' into 'master' | Rémy Coutable | 2016-10-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix broken label uniqueness label migration | Stan Hu | 2016-10-21 | 1 | -2/+2 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'change-rubocop-to-2-1' into 'master' | Robert Speicher | 2016-10-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Change target Ruby version for Rubocop to 2.1.change-rubocop-to-2-1 | Adam Niedzielski | 2016-10-20 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |