| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'bring-back-newrelic-gem' into 'master' | Rémy Coutable | 2016-02-24 | 1 | -0/+16 |
| |\ | | | | | | | | | | | | | | | | | | | Revert "Remove newrelic gem. Closes #12860" This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock See merge request !2943 | ||||
| | * | Revert "Remove newrelic gem. Closes #12860" | Stan Hu | 2016-02-23 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | This reverts commit 531767175f0a364a332c74bf27c5f202732ce519. Conflicts: Gemfile.lock | ||||
| * | | Merge branch 'issue_13301_emoji-menu' into 'master' | Robert Speicher | 2016-02-24 | 1 | -0/+2 |
| |\ \ | |/ |/| | | | | | | | | | Load award emoji picker with ajax request Fixes #13301. See merge request !2888 | ||||
| | * | Create EmojisController | Annabel Dunstone | 2016-02-22 | 1 | -1/+2 |
| | | | |||||
| | * | Load award emoji picker with ajax request | Annabel Dunstone | 2016-02-18 | 1 | -0/+1 |
| | | | |||||
| * | | Properly set `auto_link_saml_user` default value in the Settings loader. | Patricio Cano | 2016-02-22 | 1 | -0/+1 |
| | | | |||||
| * | | Add missing route to mark all todos as donetasks | Douglas Barbosa Alexandre | 2016-02-21 | 1 | -1/+6 |
| | | | |||||
| * | | Rename Tasks to Todos | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | Allow user to mark each task as done manually | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+1 |
| | | | |||||
| * | | Add tasks queue list page | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+1 |
| | | | |||||
| * | | 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 ------ | -----  |  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 | ||||
