summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated omniuath-saml to the latest version.omniauth-saml-updatePatricio Cano2016-02-032-5/+5
* Merge branch 'stanhu/gitlab-ce-support-token-retrieval-by-headers' into 'mast...Dmitriy Zaporozhets2016-02-032-0/+3
|\
| * Support download access by PRIVATE-TOKEN headerStan Hu2016-02-032-0/+3
|/
* Merge branch 'fix-build-artifacts-doc' into 'master' Achilleas Pipinellis2016-02-031-2/+6
|\
| * Documentation cleanup of artifacts section in Gitlab CI ReadmeMalte Blättermann2016-02-021-2/+6
* | Merge branch 'improve-environment-variables-doc' into 'master' Rémy Coutable2016-02-032-39/+52
|\ \
| * | Unicorn worker killer is not Omnibus specificAchilleas Pipinellis2016-02-031-2/+2
| * | Clean up environment variables docAchilleas Pipinellis2016-02-031-30/+35
| * | Improving the "Environment variables" administration docimprove-environment-variables-docRémy Coutable2016-02-012-32/+40
* | | Merge branch 'update_doc' into 'master' Achilleas Pipinellis2016-02-036-22/+67
|\ \ \
| * | | Refactor OAuth provider documentationupdate_docAchilleas Pipinellis2016-02-036-22/+67
| * | | update OAuth docValery Sizov2016-01-251-1/+1
* | | | Merge branch 'aral/gitlab-ce-master' into 'master' Achilleas Pipinellis2016-02-031-0/+6
|\ \ \ \
| * | | | Added note: working copy changes (e.g., deleted vendor folder) should be stas...aral/gitlab-ce-masterAral Balkan2016-02-011-0/+6
| | |/ / | |/| |
* | | | Merge branch 'support-akismet' into 'master' Robert Speicher2016-02-0334-7/+460
|\ \ \ \
| * | | | Update CHANGELOGsupport-akismetDouglas Barbosa Alexandre2016-02-021-1/+1
| * | | | Hide the link for spam logs if the Askimet is disabledDouglas Barbosa Alexandre2016-02-022-6/+11
| * | | | Memoize Akismet client initialization on AkismetHelperDouglas Barbosa Alexandre2016-02-021-2/+2
| * | | | Fix rubocop offensesDouglas Barbosa Alexandre2016-02-022-9/+10
| * | | | Refactor Admin::SpamLogsController to block user before destroyingDouglas Barbosa Alexandre2016-02-026-48/+46
| * | | | Refactor spam filtering on issues APIDouglas Barbosa Alexandre2016-02-022-10/+16
| * | | | Use time_ago_with_tooltip on spam logs listDouglas Barbosa Alexandre2016-02-021-1/+1
| * | | | Fix typo on User modelDouglas Barbosa Alexandre2016-02-022-1/+2
| * | | | Add model spec for SpamLogDouglas Barbosa Alexandre2016-02-021-0/+11
| * | | | Use truncate helper on spam logs listDouglas Barbosa Alexandre2016-02-024-15/+21
| * | | | Support Akismet spam checking for creation of issues via APIStan Hu2016-02-0231-7/+432
* | | | | Merge branch 'fix-tooltips-admin-nav' into 'master' Robert Speicher2016-02-031-3/+3
|\ \ \ \ \
| * | | | | Improve tooltips on admin menuZeger-Jan van de Weg2016-02-021-3/+3
* | | | | | Merge branch 'title-projects-dropdown' into 'master' Jacob Schatz2016-02-029-12/+112
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | added feature testPhil Hughes2016-01-301-1/+20
| * | | | | added testsPhil Hughes2016-01-304-3/+60
| * | | | | removed private method namingPhil Hughes2016-01-301-2/+2
| * | | | | remove period from function callPhil Hughes2016-01-301-1/+1
| * | | | | rubocop fixesPhil Hughes2016-01-301-3/+2
| * | | | | removed un-used variablePhil Hughes2016-01-301-2/+0
| * | | | | fixes issue when user is not logged in but viewing public projectPhil Hughes2016-01-301-4/+6
| * | | | | selecting project in dropdown takes user to the correct projectPhil Hughes2016-01-301-0/+3
| * | | | | uses AJAX to select the projectsPhil Hughes2016-01-305-44/+20
| * | | | | pulls in all user projectsPhil Hughes2016-01-302-8/+13
| * | | | | Added dropdown to list all projects on project headerPhil Hughes2016-01-302-5/+46
* | | | | | Update CHANGELOGRobert Speicher2016-02-021-0/+3
* | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-021-1/+1
|\ \ \ \ \ \
| * | | | | | Consistent rails_socket use.fbretel2016-01-251-1/+1
* | | | | | | Merge branch 'git-raw-workhorse' into 'master' Jacob Vosmaer2016-02-029-25/+37
|\ \ \ \ \ \ \
| * | | | | | | Use gitlab-workhorse 0.6.3 in installation guidegit-raw-workhorseJacob Vosmaer2016-02-021-1/+1
| * | | | | | | Use gitlab-workhorse 0.6.3Jacob Vosmaer2016-02-021-1/+1
| * | | | | | | Merge remote-tracking branch 'origin/master' into git-raw-workhorseJacob Vosmaer2016-02-0221-32/+414
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Use @repositoryJacob Vosmaer2016-02-021-3/+2
| * | | | | | | Gotta have newlinesJacob Vosmaer2016-02-011-1/+1
| * | | | | | | Avoid trailing 'charset=' garbageJacob Vosmaer2016-02-012-2/+4