summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | adds proper `it` for multi line. adds `find` with correct id for button.Jacob Schatz2015-12-281-3/+3
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into improved-leave-projectJacob Schatz2015-12-289-37/+130
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fixes tests failingJacob Schatz2015-12-282-3/+6
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | adds settings menu to the top for editting and leaving projectsJacob Schatz2015-12-283-9/+25
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'metrics-tuning' into 'master' Dmitriy Zaporozhets2016-01-0517-249/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tuning of metrics data to store This removes data we don't really need, as well as making sure we don't overload any cache stores or databases. See merge request !2265
| * | | | | | | | | | | | | | | | | Fix Rubocop styling in AR subscriber specsmetrics-tuningYorick Peterse2016-01-041-1/+1
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Automatically prefix transaction series namesYorick Peterse2016-01-048-20/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures Rails and Sidekiq transactions are split into the series "rails_transactions" and "sidekiq_transactions" respectively.
| * | | | | | | | | | | | | | | | | Use separate series for Rails/Sidekiq sample statsYorick Peterse2016-01-042-13/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for any tags to differentiate between Sidekiq and Rails statistics while still being able to separate the two.
| * | | | | | | | | | | | | | | | | Track total method call times per transactionYorick Peterse2016-01-042-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to see where time is spent without having to aggregate all the individual points in the method_calls series.
| * | | | | | | | | | | | | | | | | Track total query/view timings in transactionsYorick Peterse2016-01-045-0/+62
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Ability to increment custom transaction valuesYorick Peterse2016-01-042-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used to store/increment the total query/view rendering timings on a per transaction basis. This in turn can greatly reduce the amount of metrics stored.
| * | | | | | | | | | | | | | | | | Removed tracking of hostnames for metricsYorick Peterse2015-12-315-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't hugely useful and mostly wastes InfluxDB space. We can re-add this whenever needed (but only once we really need it).
| * | | | | | | | | | | | | | | | | Use separate series for Rails/Sidekiq transactionsYorick Peterse2015-12-319-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for tagging all metrics with a "process_type" tag.
| * | | | | | | | | | | | | | | | | Cache InfluxDB settings after the first useYorick Peterse2015-12-312-23/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures we don't need to load anything from either PostgreSQL or the Rails cache whenever creating new InfluxDB connections.
| * | | | | | | | | | | | | | | | | Removed tracking of raw SQL queriesYorick Peterse2015-12-315-221/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This particular setup had 3 problems: 1. Storing SQL queries as tags is very inefficient as InfluxDB ends up indexing every query (and they can get pretty large). Storing these as values instead means we can't always display the SQL as easily. 2. We already instrument ActiveRecord query methods, thus we already have timing information about database queries. 3. SQL obfuscation is difficult to get right and I'd rather not expose sensitive data by accident.
* | | | | | | | | | | | | | | | | | Merge branch 'rs-logo-animation' into 'master' Dmitriy Zaporozhets2016-01-053-8/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the logo as a loading indicator ![logo-sweep](/uploads/ff048fd2e56a6dcae8801f998b484623/logo-sweep.gif) See merge request !2277
| * | | | | | | | | | | | | | | | | | Restructure logo JS to use `setInterval`rs-logo-animationRobert Speicher2016-01-041-25/+21
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Decrease the logo sweep delayRobert Speicher2016-01-041-2/+3
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Correct the logo ID namesRobert Speicher2016-01-042-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Her left, not ours!
| * | | | | | | | | | | | | | | | | | Ensure the sweep always starts from the leftRobert Speicher2016-01-021-8/+9
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use the logo as a loading indicatorRobert Speicher2016-01-022-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #5616
| * | | | | | | | | | | | | | | | | | Give the logo shapes meaningful IDsRobert Speicher2016-01-021-7/+7
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'dedupe-notifications-watcher-and-subscriber' into 'master' Dmitriy Zaporozhets2016-01-053-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't notify users twice if they are both project watchers and subscribers Closes #4708 See merge request !2290
| * | | | | | | | | | | | | | | | | | | Don't notify users twice if they are both project watchers and subscribersStan Hu2016-01-043-0/+14
| | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #4708
* | | | | | | | | | | | | | | | | | | Merge branch 'rs-remove-jquery-blockui' into 'master' Dmitriy Zaporozhets2016-01-053-598/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove jquery.blockUI.js plugin It was only used to block the issue (but not merge request) list when the sort was changed. See merge request !2287
| * | | | | | | | | | | | | | | | | | | Remove jquery.blockUI.js pluginrs-remove-jquery-blockuiRobert Speicher2016-01-043-598/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used to block the issue (but not merge request) list when the sort was changed.
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs-abuse-reports' into 'master' Dmitriy Zaporozhets2016-01-052-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign the AbuseReports index - User profile links go to the admin area - Shows when the reported user joined - Show relative timestamp for when the report was created - Parse message with restricted Markdown pipeline to autolink URLs Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667 See merge request !2292
| * | | | | | | | | | | | | | | | | | | Redesign the AbuseReports indexrs-abuse-reportsRobert Speicher2016-01-042-10/+11
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Shows when the reported user joined - Show relative timestamp for when the report was created - Parse message with restricted Markdown pipeline to autolink URLs
* | | | | | | | | | | | | | | | | | | Merge branch 'show-all-builds-by-default' into 'master' Robert Speicher2016-01-047-71/+106
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show all builds by default in the builds page Fixes #4240 See merge request !2243
| * | | | | | | | | | | | | | | | | | Update CHANGELOGRobert Speicher2016-01-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | Show 'All' tab by default in the builds pageshow-all-builds-by-defaultDouglas Barbosa Alexandre2016-01-047-71/+107
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'debug-banzai-cache' into 'master' Robert Speicher2016-01-041-7/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue. See https://gitlab.com/gitlab-org/gitlab-ce/issues/4130#note_3012511 See merge request !2283
| * | | | | | | | | | | | | | | | | | Add DEBUG_BANZAI_CACHE env var to debug Banzai cache issue.debug-banzai-cacheDouwe Maan2016-01-041-7/+14
| |/ / / / / / / / / / / / / / / / /