summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helperLin Jen-Shin2017-08-0314-51/+15
| | | | | | | | | `:mailer` is needed to pick it easily, while `type: :mailer` is needed for picking it automatically for tests located in spec/mailers/*_spec.rb It's a bit complicated in spec/services/notification_service_spec.rb but we'll leave it alone for now.
* Merge branch '35232-next-unresolved' into 'master'Clement Ho2017-08-032-5/+9
|\ | | | | | | | | | | | | fix Jump to next discussion Closes #35232 See merge request !13076
| * fix Jump to next discussion35232-next-unresolvedSimon Knox2017-07-272-5/+9
| | | | | | | | Notes tab was renamed to show, was previously overridden in merge_request_tabs.js
* | Merge branch 'winh-project-page-dropdown-style' into 'master'Annabel Dunstone Gray2017-08-034-3/+55
|\ \ | | | | | | | | | | | | | | | | | | Make dropdown style on project page consistent Closes #35778 See merge request !13193
| * | Make dropdown style on project page consistentWinnie Hellmann2017-08-034-3/+55
|/ /
* | Merge branch '28472-ignore-auto-generated-mails' into 'master'Sean McGivern2017-08-038-26/+51
|\ \ | | | | | | | | | | | | | | | | | | Don't send rejection mails for all auto-generated mails Closes #28472 See merge request !13254
| * | Check against "Auto-Submitted: no" insteadLin Jen-Shin2017-08-031-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would be much more accurate. We assume this is an auto-generated email if such header is provided, and the value is not "no". It could also be: "auto-generated", "auto-replied", or other values from extension. It seems that only "no" could mean that this is sent by a human. See: https://tools.ietf.org/html/rfc3834
| * | Don't send rejection mails for all auto-generated mails28472-ignore-auto-generated-mailsLin Jen-Shin2017-08-038-26/+42
| | | | | | | | | | | | Also make it easier to have mailer helper
* | | Merge branch 'fix-gitaly-install' into 'master'Rémy Coutable2017-08-033-12/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure we run installation Rake tasks in a clean env in TestEnv Closes #35859 See merge request !13249
| * | | Don't call load_tasks as this would load the tasks twicefix-gitaly-installRémy Coutable2017-08-022-8/+8
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | Ensure we run installation Rake tasks in a clean env in TestEnvRémy Coutable2017-08-022-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we call `system('rake', 'taks_name')`, `ENV['RUBYOPT']` is set to `'-rbundler/setup'` but some tasks (e.g. `gitlab:gitaly:install` need a clean env since they install their own Gem bundle. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'dm-api-current-user' into 'master'Sean McGivern2017-08-032-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not validate CSRF token in API unless needed Closes #35705 See merge request !13256
| * | | | Do not validate CSRF token in API unless neededdm-api-current-userDouwe Maan2017-08-022-1/+3
| | | | |
* | | | | Merge branch 'gitaly-test-mtime-check' into 'master'Rémy Coutable2017-08-032-1/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove test gitaly when older than version file See merge request !13250
| * | | | | Remove test gitaly when older than version fileJacob Vosmaer (GitLab)2017-08-032-1/+21
|/ / / / /
* | | | | Merge branch 'sidebar-fly-out-sub-nav' into 'master'Filipa Lacerda2017-08-035-38/+335
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fly-out dropdown menu in new sidebar Closes #34026 See merge request !12938
| * \ \ \ \ Merge branch 'master' into sidebar-fly-out-sub-navsidebar-fly-out-sub-navPhil Hughes2017-08-021677-9482/+16762
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | stop mobile from showing the sub-itemsPhil Hughes2017-08-022-3/+51
| | | | | |
| * | | | | changed variable namesPhil Hughes2017-08-021-10/+10
| | | | | |
| * | | | | Math.floor the value in the testsPhil Hughes2017-08-011-1/+1
| | | | | |
| * | | | | fixed translate3d testPhil Hughes2017-08-012-6/+6
| | | | | |
| * | | | | reverted the JS timeout codePhil Hughes2017-08-013-73/+16
| | | | | | | | | | | | | | | | | | | | | | | | improved specs so that they pass
| * | | | | added mouseleave timeout with JSPhil Hughes2017-08-013-20/+206
| | | | | |
| * | | | | fixed inside padding of fly-out menuPhil Hughes2017-07-281-1/+1
| | | | | |
| * | | | | updated hover text color of main links in sidebarPhil Hughes2017-07-281-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed colors in fly-out navigation fixed spacing in fly-out navigation
| * | | | | style updatesPhil Hughes2017-07-262-37/+32
| | | | | | | | | | | | | | | | | | | | | | | | fixed weird dropdown items in issues when on merge request page
| * | | | | added extra padding around fly-out menu to delay hidingPhil Hughes2017-07-251-1/+11
| | | | | |
| * | | | | improvements to positioning of the dropdownPhil Hughes2017-07-243-5/+22
| | | | | |
| * | | | | Merge branch 'master' into sidebar-fly-out-sub-navPhil Hughes2017-07-24586-2209/+9742
| |\ \ \ \ \
| * | | | | | changed text color for reseting & hover on linksPhil Hughes2017-07-191-1/+2
| | | | | | |
| * | | | | | changed hover color in dropdownPhil Hughes2017-07-191-1/+1
| | | | | | |
| * | | | | | updated stylesPhil Hughes2017-07-193-49/+13
| | | | | | |
| * | | | | | moved JS & only run when new_nav cookie existsPhil Hughes2017-07-194-27/+78
| | | | | | |
| * | | | | | transform the positionPhil Hughes2017-07-192-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly position the arrow fix scss lint
| * | | | | | Fly-out dropdown menu in new sidebarPhil Hughes2017-07-193-2/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34026 [ci skip]
* | | | | | | Merge branch 'pawel/fix_link_to_prometheus_docs-33921' into 'master'Filipa Lacerda2017-08-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Prometheus application settings help link to point to Prometheus help page Closes #33921 See merge request !13258
| * | | | | | | Fix Prometheus help link to lead to proper Prometheus help pagepawel/fix_link_to_prometheus_docs-33921Pawel Chojnacki2017-08-021-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '35869-disable-the-Rails/Delegate-cop' into 'master'Douwe Maan2017-08-031-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the Rails/Delegate cop Closes #35869 See merge request !13267
| * | | | | | | Disable the Rails/Delegate copRémy Coutable2017-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/35869 for the rationale. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | Merge branch 'rs-empty_project-default' into 'master'Rémy Coutable2017-08-03672-1523/+1512
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Empty project factory by default See merge request !13260
| * | | | | | | Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-02672-1478/+1474
| | | | | | | |
| * | | | | | | Remove `:empty_project` factory, implement `:repository` traitRobert Speicher2017-08-021-48/+43
| | | | | | | |
| * | | | | | | Remove documentation about `:empty_project` since we're removing itRobert Speicher2017-08-021-2/+0
| | | | | | | |
| * | | | | | | Use `:empty_project` where possible in features/stepsRobert Speicher2017-08-022-2/+2
| |/ / / / / /
* | | | | | | Merge branch 'project-foreign-keys-without-errors' into 'master'Stan Hu2017-08-032-8/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change project FK migration to skip existing FKs Closes #35243 See merge request !13235
| * | | | | | Change project FK migration to skip existing FKsproject-foreign-keys-without-errorsYorick Peterse2017-08-022-8/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the migration ProjectForeignKeysWithCascadingDeletes so that it does not add already existing foreign keys and indexes, making it easier to re-run the migration.
* | | | | | | Merge branch '34027-add-icons-to-sidebar' into 'master'Phil Hughes2017-08-0236-56/+185
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add icons to project sidebar Closes #34027 and #35877 See merge request !13204
| * | | | | | | Add icons to project sidebarAnnabel Dunstone Gray2017-08-0236-56/+185
|/ / / / / / /
* | | | | | | Merge branch 'handle-reserved-words-for-oauth-usernames' into 'master'Rémy Coutable2017-08-023-2/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uniquify reserved word usernames on OAuth user creation See merge request !13244
| * | | | | | | Uniquify reserved word usernames on OAuth user creationRobin Bobbitt2017-08-023-2/+41
| | | | | | | |
View Lorry Controller Status