summaryrefslogtreecommitdiff
path: root/config
Commit message (Collapse)AuthorAgeFilesLines
* Remove code introduced when endpoint was in MR controller.Rubén Dávila2016-02-191-1/+0
|
* Add new endpoint and button to revert any commit.Rubén Dávila2016-02-191-0/+1
|
* Add new endpoint and button to revert merge. #3409Rubén Dávila2016-02-191-0/+1
|
* Use POST method instead of DELETE when erasing a buildGrzegorz Bizon2016-02-191-1/+1
| | | | | Discussion: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
* Change build erase path to make it consistent with APIGrzegorz Bizon2016-02-191-1/+1
|
* Use DELETE verb for erasing a build contentGrzegorz Bizon2016-02-191-1/+1
| | | | Also added API specs for that
* Add build eraseable feature implementationGrzegorz Bizon2016-02-191-0/+1
|
* Merge branch 'saml-decoupling' into 'master'Patricio Cano2016-02-191-2/+9
|\
| * Document true/false as supported value.saml-decouplingDouwe Maan2016-02-191-2/+2
| |
| * Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-2/+9
| |
* | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-191-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 pathRobert Speicher2016-02-121-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 Speicher2016-02-181-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 Pidgeon2016-02-181-1/+1
| |/ | | | | | | confirmed this
* | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-181-9/+2
| | | | | | | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* | Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan2016-02-182-2/+3
|\ \ | | | | | | | | | | | | | | | | | | Add release tracking for Sentry See merge request !2863
| * | Add release tracking for Sentryrs-sentry-release-trackingRobert Speicher2016-02-172-2/+3
| |/
* | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-181-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 logicPatricio Cano2016-02-181-2/+9
| |/
* | Use SCAN during 'rake cache:clear'cache-clearJacob Vosmaer2016-02-181-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 controllerGrzegorz Bizon2016-02-111-2/+6
|
* Fix rubocop offence in routes for build badgeGrzegorz Bizon2016-02-111-1/+1
|
* Move badge implementation to builds controllerGrzegorz Bizon2016-02-111-8/+3
|
* Skip authentication when requesting commit status badgeGrzegorz Bizon2016-02-111-1/+1
|
* Improve CI status badge implementationGrzegorz Bizon2016-02-111-2/+2
|
* Add CI status badge implementation to commit controllerGrzegorz Bizon2016-02-111-0/+7
|
* Merge branch 'doc_relative_url' into 'master' Achilleas Pipinellis2016-02-103-16/+17
|\ | | | | | | | | | | | | Add documentation on relative URL support closes #12773 See merge request !2770
| * Fix typos and grammarAchilleas Pipinellis2016-02-103-3/+6
| | | | | | | | [ci skip]
| * Edit configuration files for relative URL supportAchilleas Pipinellis2016-02-093-16/+14
| | | | | | | | [ci skip]
* | Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-101-0/+1
|\ \ | | | | | | | | | | | | | | | | | | Add ajax filtering to all paged project lists. Fixes #13182 See merge request !2728
| * | Extract events rendering to own action.Josh Frye2016-02-091-0/+1
| | |
* | | Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-091-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 logsKamil Trzcinski2016-02-091-1/+1
| | |/ | |/| | | | | | | This prevents leakage of CI Secure Variables
* | | Merge pull request #10023 from bozaro/smtp-portDouwe Maan2016-02-091-1/+1
|\ \ \ | |_|/ |/| | Change default smpt port to 465 (default smtps port)
| * | Change default smpt port to 465 (default smtps port)Artem V. Navrotskiy2016-02-091-1/+1
| |/
* | Allow limited Markdown in Broadcast Messagesrs-broadcast-markdownRobert Speicher2016-02-061-1/+4
|/ | | | Closes #11853
* Remove newrelic gem. Closes #12860remove-newrelicJosh Frye2016-02-031-16/+0
|
* Merge branch 'improve-environment-variables-doc' into 'master' Rémy Coutable2016-02-031-2/+10
|\ | | | | | | | | | | | | | | | | Improving the "Environment variables" administration doc Closes #12829. /cc @sytses See merge request !2669
| * Improving the "Environment variables" administration docimprove-environment-variables-docRémy Coutable2016-02-011-2/+10
| |
* | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-021-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-instrumentationYorick Peterse2016-02-011-0/+10
| |
* | Instrument all Gitlab::Git instance methodsYorick Peterse2016-02-011-2/+4
|/
* Increase the minimum length for commit SHA matching to 7rs-issue-12706Robert Speicher2016-01-291-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-filtersRobert Speicher2016-01-281-0/+6
| | | | This reverts commit b0145d765b94d2cef86b10b6dd22895779cfef33.
* Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-281-1/+1
|\ | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| * Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-201-1/+1
| |
* | Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-261-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_patchValery Sizov2016-01-251-0/+48
| |
* | Instrument Gitlab::Git::RepositoryYorick Peterse2016-01-211-0/+1
| | | | | | | | | | This adds instrumentation for the instance methods of Gitlab::Git::Repository.
* | Implement new UI for paginationDmitriy Zaporozhets2016-01-201-0/+4
| |