summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | | | | | Milestone reference is a Markdown linkmilestone-refDouwe Maan2016-01-072-2/+3
| | | | | | | | | | | |
| | | * | | | | | | | | Merge branch 'master' into milestone-refDouwe Maan2016-01-062-7/+72
| | | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Remove icon from milestone reference.Douwe Maan2016-01-051-2/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'master' into milestone-refDouwe Maan2016-01-0536-261/+1331
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
| | | * | | | | | | | | | Merge branch 'master' into milestone-refDouwe Maan2015-12-253-0/+60
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into milestone-refDouwe Maan2015-12-248-5/+257
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Link to milestone in "Milestone changed" system noteDouwe Maan2015-12-241-1/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Render milestone links as referencesDouwe Maan2015-12-245-0/+99
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'annotate-models-20160105' into 'master' Dmitriy Zaporozhets2016-01-0716-135/+174
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Annotate models Time to refresh the comments via `annotate`. See merge request !2311
| | | * | | | | | | | | | | | Annotate modelsStan Hu2016-01-0616-135/+174
| | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | fixes ajax issue with issue specajax-issues-fixJacob Schatz2016-01-071-16/+16
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'remove-more-influxdb-tags' into 'master' Yorick Peterse2016-01-072-5/+16
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | See merge request !2328
| | | * | | | | | | | | | Store request methods/URIs as valuesYorick Peterse2016-01-072-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since filtering by these values is very rare (they're mostly just displayed as-is) we don't need to waste any index space by saving them as tags. By storing them as values we also greatly reduce the number of series in InfluxDB.
| | | * | | | | | | | | | Removed UUIDs from metrics transactionsYorick Peterse2016-01-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While useful for finding out what methods/views belong to a transaction this might result in too much data being stored in InfluxDB.
| | * | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-072-0/+78
| | |/ / / / / / / / / /
| | * | | | | | | | | | Revert "Store SQL/view timings in milliseconds"Yorick Peterse2016-01-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7549102bb727daecc51da84af39956b32fc41537. Apparently I was wrong about ActiveSupport::Notifications::Event#duration returning the duration in seconds, instead it returns it in milliseconds already.
| | * | | | | | | | | | Merge branch 'more-opengraph' into 'master' Robert Speicher2016-01-061-46/+18
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Open Graph data for group, project and commit. See merge request !2211
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into more-opengraphmore-opengraphDouwe Maan2016-01-062-7/+72
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Don't override issue page description in project layout.Douwe Maan2016-01-061-4/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Make `page_description` less magical :sparkles:Robert Speicher2016-01-051-25/+2
| | | | | | | | | | | | |
| | | * | | | | | | | | | Use `User#avatar_url` instead of `avatar_icon` helperRobert Speicher2016-01-051-35/+16
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'master' into more-opengraphDouwe Maan2016-01-0535-261/+1184
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/layouts/_head.html.haml
| | | * | | | | | | | | | Use `assign` instead of `instance_variable_set`Robert Speicher2015-12-271-7/+7
| | | | | | | | | | | | |
| | | * | | | | | | | | | Add specs for page_image using a Group's avatarRobert Speicher2015-12-271-0/+16
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'fix-banzai-cache' into 'master' Robert Speicher2016-01-061-1/+14
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix mentionable reference extraction caching. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4130 Reverts https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2120 and https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2283 See merge request !2315
| | | * | | | | | | | | | | Add regression test.fix-banzai-cacheDouwe Maan2016-01-061-1/+14
| | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | * | | | | | | | | | | Store SQL/view timings in millisecondsYorick Peterse2016-01-062-3/+3
| | | |_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transaction timings are also already stored in milliseconds, this keeps things consistent.
| | * | | | | | | | | | Merge branch 'import-gh-pull-requests' into 'master' Douwe Maan2016-01-063-0/+403
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import GitHub Pull Requests into GitLab Fixes #2833 See merge request !2168
| | | * | | | | | | | | Ensure that we're only importing local pull requestsDouglas Barbosa Alexandre2016-01-051-0/+22
| | | | | | | | | | | |
| | | * | | | | | | | | Generate separate comments when importing GitHub Issues into GitLabDouglas Barbosa Alexandre2016-01-053-4/+152
| | | | | | | | | | | |
| | | * | | | | | | | | Refactoring GithubImport::ImporterDouglas Barbosa Alexandre2016-01-052-0/+233
| | | | | | | | | | | |
| | * | | | | | | | | | Fix notification specfix-notification-specDouwe Maan2016-01-051-1/+1
| | |/ / / / / / / / /
| | * | | | | | | | | Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' Douwe Maan2016-01-051-6/+71
| | |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better support for referencing and closing issues in asana_service.rb (by @mikew1) See merge request !2302
| | | * | | | | | | | Satisfy RubocopDouwe Maan2016-01-051-1/+1
| | | | | | | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into better-asana-refsMike Wyatt2015-12-3173-189/+2175
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (307 commits) Update CHANGELOG spinach fix Updated allocations Gem to version 1.0.3 Removed various default metrics tags Update CHANGELOG Fix "I see current user as the first user" step Swap Author and Assignee Selectors on issuable index view Update CHANGELOG Make sure that is no pending migrations in Gitlab::CurrentSettings Added additional config environmental variables to help Debian packaging We don't use whenever anymore. Lets remove the schedule file Fix project transfer e-mail sending incorrect paths in e-mail notification Update CHANGELOG Use Gitlab::CurrentSettings for InfluxDB Write to InfluxDB directly via UDP Strip newlines from obfuscated SQL Add hotfix that allows to access build artifacts created before 8.3 note votes methids implementation When reCAPTCHA is disabled, allow registrations to go through without a code Downcased user or email search for avatar_icon. ...
| | | * | | | | | | | Use `execute` in Asana specsMike Wyatt2015-12-311-15/+18
| | | | | | | | | | |
| | | * | | | | | | | Actually test the posted comment in Asana serviceMike Wyatt2015-12-311-4/+21
| | | | | | | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'origin/master' into better-asana-refsMike Wyatt2015-12-3023-40/+40
| | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/master: Use lazy reference extractor to get issue's MRs Banzai::XFilter -> Banzai::Filter::XFilter Move Markdown/reference logic from Gitlab::Markdown to Banzai
| | | * | | | | | | | | Update Asana specsMike Wyatt2015-12-291-8/+32
| | | | | | | | | | | |
| | | * | | | | | | | | better support for referencing and closing issues in asana_service.rbMike Wyatt2015-12-161-0/+21
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'rs-abuse-reports-refactor' into 'master' Douwe Maan2016-01-053-55/+80
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Abuse Report refactors - Redirect back to user profile after report - "Tell, Don't Ask" for sending report notifications See merge request !2293
| | | * | | | | | | | | | Add `AbuseReport#notify`rs-abuse-reports-refactorRobert Speicher2016-01-042-55/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell, Don't Ask.
| | | * | | | | | | | | | Make AbuseReportMailer responsible for knowing if it should deliverRobert Speicher2016-01-041-0/+38
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'pr-9938' into 'master' Douwe Maan2016-01-051-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notification Hotfix note mail with notification See merge request !2288
| | | * | | | | | | | | | | Merge pull request GH-9938 from huacnlee/hotfix/note_mail_with_notificationpr-9938Douwe Maan2016-01-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfix note mail with notification
| | * | | | | | | | | | | | Merge branch 'rs-relative-links-to-root' into 'master' Douwe Maan2016-01-051-0/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support a single directory traversal in RelativeLinkFilter Prior, if we were viewing a blob at `https://example.com/namespace/project/blob/master/doc/some-file.md` and it contained a relative link such as `[README](../README.md)`, the resulting link when viewing the blob would be: `https://example.com/namespace/project/blob/README.md` which omits the `master` ref, resulting in a 404. Fixes https://gitlab.com/gitlab-org/release-tools/issues/3 See merge request !2247
| | | * | | | | | | | | | | | Support a single directory traversal in RelativeLinkFilterrs-relative-links-to-rootRobert Speicher2015-12-301-0/+8
| | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, if we were viewing a blob at `https://example.com/namespace/project/blob/master/doc/some-file.md` and it contained a relative link such as `[README](../README.md)`, the resulting link when viewing the blob would be: `https://example.com/namespace/project/blob/README.md` which omits the `master` ref, resulting in a 404.
| | * | | | | | | | | | | | Merge branch 'fix-api-lookup-with-usernames-with-dots' of ↵Dmitriy Zaporozhets2016-01-051-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce
| | | * | | | | | | | | | | | Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-031-0/+9
| | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempting to use the /projects/:id API by specifying :id in "namespace/project" format would always result in a 404 if the namespace contained a dot. The reason? From http://guides.rubyonrails.org/routing.html#specifying-constraints: "By default the :id parameter doesn't accept dots - this is because the dot is used as a separator for formatted routes. If you need to use a dot within an :id add a constraint which overrides this - for example id: /[^\/]+/ allows anything except a slash." Closes https://github.com/gitlabhq/gitlabhq/issues/9573
| | * | | | | | | | | | | | Merge branch 'improved-leave-project' into 'master' Dmitriy Zaporozhets2016-01-051-2/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds settings menu to the top for editting and leaving projects @creamzy @skyruler @dzaporozhets Menu contents depends on user's rights. Fixes #4221 ![Screen_Shot_2015-12-23_at_10.02.47_PM](/uploads/daeaef937bf9d9f4db7ccb674e344ac1/Screen_Shot_2015-12-23_at_10.02.47_PM.png) ![Screen_Shot_2015-12-23_at_10.02.41_PM](/uploads/58eb4eea7d640f01d7f05c2a408a2c04/Screen_Shot_2015-12-23_at_10.02.41_PM.png) ![Screen_Shot_2015-12-23_at_10.02.55_PM](/uploads/4b2ae027a13efcbad3eb81b04f134c4f/Screen_Shot_2015-12-23_at_10.02.55_PM.png) ![Screen_Shot_2015-12-23_at_10.04.47_PM](/uploads/bd5d9d8ddd72d16d74c32c6c1f569776/Screen_Shot_2015-12-23_at_10.04.47_PM.png) See merge request !2195
View Lorry Controller Status