Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove code introduced when endpoint was in MR controller. | Rubén Dávila | 2016-02-19 | 1 | -1/+0 |
| | |||||
* | Add new endpoint and button to revert any commit. | Rubén Dávila | 2016-02-19 | 1 | -0/+1 |
| | |||||
* | Add new endpoint and button to revert merge. #3409 | Rubén Dávila | 2016-02-19 | 1 | -0/+1 |
| | |||||
* | Use POST method instead of DELETE when erasing a build | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 |
| | | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042 | ||||
* | Change build erase path to make it consistent with API | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 |
| | |||||
* | Use DELETE verb for erasing a build content | Grzegorz Bizon | 2016-02-19 | 1 | -1/+1 |
| | | | | Also added API specs for that | ||||
* | Add build eraseable feature implementation | Grzegorz Bizon | 2016-02-19 | 1 | -0/+1 |
| | |||||
* | Merge branch 'saml-decoupling' into 'master' | Patricio Cano | 2016-02-19 | 1 | -2/+9 |
|\ | |||||
| * | Document true/false as supported value.saml-decoupling | Douwe Maan | 2016-02-19 | 1 | -2/+2 |
| | | |||||
| * | Decouple SAML authentication from the default Omniauth logic | Patricio Cano | 2016-02-18 | 1 | -2/+9 |
| | | |||||
* | | Merge branch 'rs-emoji' into 'master' | Douwe Maan | 2016-02-19 | 1 | -2/+2 |
|\ \ | |/ |/| | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800 | ||||
| * | Update Emoji asset path | Robert Speicher | 2016-02-12 | 1 | -2/+2 |
| | | | | | | | | | | Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder. | ||||
* | | Merge branch 'patch-1' into 'master' | Robert Speicher | 2016-02-18 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bug found by Charles Sibbald at Sky. Calls with patricio and Jacob confirmed this. [ci skip] See merge request !2877 | ||||
| * | | bug found by Charles Sibbald at Sky . Calls with patricio and Jacob ↵ | Richard Pidgeon | 2016-02-18 | 1 | -1/+1 |
| |/ | | | | | | | confirmed this | ||||
* | | Revert "Merge branch 'saml-decoupling' into 'master' " | Douwe Maan | 2016-02-18 | 1 | -9/+2 |
| | | | | | | | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9. | ||||
* | | Merge branch 'rs-sentry-release-tracking' into 'master' | Douwe Maan | 2016-02-18 | 2 | -2/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Add release tracking for Sentry See merge request !2863 | ||||
| * | | Add release tracking for Sentryrs-sentry-release-tracking | Robert Speicher | 2016-02-17 | 2 | -2/+3 |
| |/ | |||||
* | | Merge branch 'saml-decoupling' into 'master' | Robert Speicher | 2016-02-18 | 1 | -2/+9 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Decouple SAML authentication from the default Omniauth logic Fixes gitlab-org/gitlab-ee#178 With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118 See merge request !2782 | ||||
| * | | Decouple SAML authentication from the default Omniauth logic | Patricio Cano | 2016-02-18 | 1 | -2/+9 |
| |/ | |||||
* | | Use SCAN during 'rake cache:clear'cache-clear | Jacob Vosmaer | 2016-02-18 | 1 | -1/+3 |
|/ | | | | | | This allows 'rake cache:clear' to delete millions of keys without choking. It requires Redis 2.8.0 or newer but we needed that already anyway. | ||||
* | Move builds badge implementation to new badges controller | Grzegorz Bizon | 2016-02-11 | 1 | -2/+6 |
| | |||||
* | Fix rubocop offence in routes for build badge | Grzegorz Bizon | 2016-02-11 | 1 | -1/+1 |
| | |||||
* | Move badge implementation to builds controller | Grzegorz Bizon | 2016-02-11 | 1 | -8/+3 |
| | |||||
* | Skip authentication when requesting commit status badge | Grzegorz Bizon | 2016-02-11 | 1 | -1/+1 |
| | |||||
* | Improve CI status badge implementation | Grzegorz Bizon | 2016-02-11 | 1 | -2/+2 |
| | |||||
* | Add CI status badge implementation to commit controller | Grzegorz Bizon | 2016-02-11 | 1 | -0/+7 |
| | |||||
* | Merge branch 'doc_relative_url' into 'master' | Achilleas Pipinellis | 2016-02-10 | 3 | -16/+17 |
|\ | | | | | | | | | | | | | Add documentation on relative URL support closes #12773 See merge request !2770 | ||||
| * | Fix typos and grammar | Achilleas Pipinellis | 2016-02-10 | 3 | -3/+6 |
| | | | | | | | | [ci skip] | ||||
| * | Edit configuration files for relative URL support | Achilleas Pipinellis | 2016-02-09 | 3 | -16/+14 |
| | | | | | | | | [ci skip] | ||||
* | | Merge branch 'fix-explore-filter' into 'master' | Dmitriy Zaporozhets | 2016-02-10 | 1 | -0/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728 | ||||
| * | | Extract events rendering to own action. | Josh Frye | 2016-02-09 | 1 | -0/+1 |
| | | | |||||
* | | | Merge branch 'variables-build-log' into 'master' | Robert Speicher | 2016-02-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notice about variables in build log Related to: https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1942 [ci skip] See merge request !2761 | ||||
| * | | | Filter out variables from production logs | Kamil Trzcinski | 2016-02-09 | 1 | -1/+1 |
| | |/ | |/| | | | | | | | This prevents leakage of CI Secure Variables | ||||
* | | | Merge pull request #10023 from bozaro/smtp-port | Douwe Maan | 2016-02-09 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Change default smpt port to 465 (default smtps port) | ||||
| * | | Change default smpt port to 465 (default smtps port) | Artem V. Navrotskiy | 2016-02-09 | 1 | -1/+1 |
| |/ | |||||
* | | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdown | Robert Speicher | 2016-02-06 | 1 | -1/+4 |
|/ | | | | Closes #11853 | ||||
* | Remove newrelic gem. Closes #12860remove-newrelic | Josh Frye | 2016-02-03 | 1 | -16/+0 |
| | |||||
* | Merge branch 'improve-environment-variables-doc' into 'master' | Rémy Coutable | 2016-02-03 | 1 | -2/+10 |
|\ | | | | | | | | | | | | | | | | | Improving the "Environment variables" administration doc Closes #12829. /cc @sytses See merge request !2669 | ||||
| * | Improving the "Environment variables" administration docimprove-environment-variables-doc | Rémy Coutable | 2016-02-01 | 1 | -2/+10 |
| | | |||||
* | | Support Akismet spam checking for creation of issues via API | Stan Hu | 2016-02-02 | 1 | -0/+2 |
| | | | | | | | | | | | | | | Currently any spam detected by Akismet by non-members via API will be logged in a separate table in the admin page. Closes #5612 | ||||
* | | Instrument various Rugged constantsexpand-git-instrumentation | Yorick Peterse | 2016-02-01 | 1 | -0/+10 |
| | | |||||
* | | Instrument all Gitlab::Git instance methods | Yorick Peterse | 2016-02-01 | 1 | -2/+4 |
|/ | |||||
* | Increase the minimum length for commit SHA matching to 7rs-issue-12706 | Robert Speicher | 2016-01-29 | 1 | -1/+1 |
| | | | | | | This is the git default and will help to prevent false positive matches. Closes #12706 | ||||
* | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""rs-revert-revert-remove-coffee-filters | Robert Speicher | 2016-01-28 | 1 | -0/+6 |
| | | | | This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33. | ||||
* | Merge branch 'issue_2406' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376 | ||||
| * | Setup new fork link in sidebar and routes. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | |||||
* | | Update ExternalIssue regex for JIRA integration | Blake Hitchcock | 2016-01-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | The pattern in the `::reference_pattern` class method in the ExternalIssue model does not match all valid forms of JIRA project names. I have updated the regex to match JIRA project names with numbers and underscores. More information on valid JIRA project names can be found here: https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html * The first character must be a letter, * All letters used in the project key must be from the Modern Roman Alphabet and upper case, and * Only letters, numbers or the underscore character can be used. | ||||
* | | monkey patch for mysql 5.7monkey_patch | Valery Sizov | 2016-01-25 | 1 | -0/+48 |
| | | |||||
* | | Instrument Gitlab::Git::Repository | Yorick Peterse | 2016-01-21 | 1 | -0/+1 |
| | | | | | | | | | | This adds instrumentation for the instance methods of Gitlab::Git::Repository. | ||||
* | | Implement new UI for pagination | Dmitriy Zaporozhets | 2016-01-20 | 1 | -0/+4 |
| | |