summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix project destroy callbackfix/project-destroy-callbacksGrzegorz Bizon2016-01-051-4/+2
| | | | See gitlab-org/gitlab-ee!107.
* Merge branch 'mikew1/gitlab-ce-better-asana-refs' into 'master' Douwe Maan2016-01-052-48/+111
|\ | | | | | | | | | | | | Better support for referencing and closing issues in asana_service.rb (by @mikew1) See merge request !2302
| * Satisfy RubocopDouwe Maan2016-01-051-1/+1
| |
| * Don't log backtrace in Asana servicemikew1/gitlab-ce-better-asana-refsMike Wyatt2016-01-041-1/+0
| |
| * Merge remote-tracking branch 'upstream/master' into better-asana-refsMike Wyatt2015-12-31403-2136/+22333
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| | |
| * | Better handling of errors in Asana serviceMike Wyatt2015-12-301-9/+8
| | | | | | | | | | | | [ci skip]
| * | Update Asana service documentationMike Wyatt2015-12-301-2/+2
| | |
| * | Restore colon in Asana commentMike Wyatt2015-12-301-1/+1
| | |
| * | Merge remote-tracking branch 'origin/master' into better-asana-refsMike Wyatt2015-12-3084-495/+546
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | Fix error in Asana serviceMike Wyatt2015-12-291-1/+1
| | | |
| * | | Update Asana specsMike Wyatt2015-12-291-8/+32
| | | |
| * | | Update Asana service to work with Personal Access Token, lessen number of ↵Mike Wyatt2015-12-291-31/+21
| | | | | | | | | | | | | | | | requests to Asana API
| * | | Update Asana field descriptionsMike Wyatt2015-12-291-4/+2
| | | |
| * | | better support for referencing and closing issues in asana_service.rbMike Wyatt2015-12-162-8/+41
| | | |
* | | | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-056-0/+117
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
| * | | | Fix diverging commit count calculationbrunsa2/gitlab-ce-diverging-branch-graphsJeff Stubler2015-12-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rugged seemed to stop accepting branch names as valid refs, throwing `Rugged::ReferenceError` exceptions. Now the branch target rather than branch name is used, and the default branch's hash is also calculated, and these work properly. This used to work and might be something worth re-investigating in the future.
| * | | | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-03582-4651/+9171
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-12297-1025/+4533
| |\ \ \ \ \
| * | | | | | Refactor for style issuesJeff Stubler2015-11-113-21/+17
| | | | | | |
| * | | | | | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-0215-112/+211
| |\ \ \ \ \ \
| * | | | | | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-016-2/+122
| | | | | | | |
* | | | | | | | Merge branch 'joshfng/gitlab-ce-fix-3802' into 'master' Douwe Maan2016-01-055-4/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show 'New Merge Request' buttons on canonical repo. (by @joshfng) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2189 to run tests on our runners. See merge request !2300
| * | | | | | | | Change text back. Add additional tests.joshfng/gitlab-ce-fix-3802Josh Frye2016-01-033-3/+14
| | | | | | | | |
| * | | | | | | | Remove feature tag from testing locallyJosh Frye2016-01-031-1/+0
| | | | | | | | |
| * | | | | | | | Fix testsJosh Frye2016-01-032-2/+2
| | | | | | | | |
| * | | | | | | | Show 'New Merge Request' buttons on canonical repo.Josh Frye2016-01-035-5/+29
| | | | | | | | |
* | | | | | | | | Merge branch 'rs-abuse-reports-refactor' into 'master' Douwe Maan2016-01-056-61/+101
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-044-58/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tell, Don't Ask.
| * | | | | | | | | Make AbuseReportMailer responsible for knowing if it should deliverRobert Speicher2016-01-042-1/+47
| | | | | | | | | |
| * | | | | | | | | Redirect back to user profile page after abuse reportRobert Speicher2016-01-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the reporter will see the fruits of their labor, namely, the red icon!
* | | | | | | | | | Merge branch 'pr-9938' into 'master' Douwe Maan2016-01-052-1/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hotfix note mail with notification
* | | | | | | | | | | Merge branch 'rs-relative-links-to-root' into 'master' Douwe Maan2016-01-052-1/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'ssh-doc-fixes' into 'master' Hannes Rosenögger2016-01-051-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Help "SSH" fixes A user was confused why ssh login did not work because he had used a nonstandard name during the key generation step. Maybe this will make it clearer. See merge request !2296
| * | | | | | | | | | | | Fix grammarFelix Eckhofer2016-01-051-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Clarify the key generation stepFelix Eckhofer2016-01-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users must not change the default filename or they will have to create a suitable .ssh/config which is out-of-scope here.
| * | | | | | | | | | | | Remove misleading `ssh-dsa`Felix Eckhofer2016-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keytype field is actually `ssh-dss` for DSA keys and they will not be stored as `id_rsa.pub`. Note that newer version of ssh actually also support `ecdsa-sha2-nistp256` and others so it is also misleading to assume the field always starts with `ssh-`.
* | | | | | | | | | | | | Merge branch 'new-markdown' into 'master' Dmitriy Zaporozhets2016-01-052-263/+263
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | markdown fixes old ![Screenshot_2016-01-05_10.49.46](/uploads/731f0e83ceefa74650ea27f8dca67b35/Screenshot_2016-01-05_10.49.46.png) new ![Screenshot_2016-01-05_10.51.51](/uploads/85a82b2a589f9a4ad3dd47c6de3b89d7/Screenshot_2016-01-05_10.51.51.png) See merge request !2295
| * | | | | | | | | | | | markdown fixesnew-markdownAndriy Dyadyura2016-01-051-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | markdown fixesAndriy Dyadyura2016-01-052-263/+263
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix-api-lookup-with-usernames-with-dots' of ↵Dmitriy Zaporozhets2016-01-053-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/stanhu/gitlab-ce
| * | | | | | | | | | | | Fix API project lookups when querying with a namespace with dotsStan Hu2016-01-033-1/+11
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote-tracking branch 'origin/crosslink-env-docs'Dmitriy Zaporozhets2016-01-052-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | | Fix link, filename and crosslink to omnibus docs.crosslink-env-docsSytse Sijbrandij2015-12-292-2/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'improved-leave-project' into 'master' Dmitriy Zaporozhets2016-01-054-18/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | rempves tests for "you have master access" textimproved-leave-projectJacob Schatz2016-01-041-1/+0
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | removes footer message about access to projectJacob Schatz2016-01-041-8/+1
| | | | | | | | | | | | | |
View Lorry Controller Status