summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bump rack-oauth2 to ~> 1.2.1rs-update-rack-oauth2Robert Speicher2015-11-242-4/+4
* Merge branch 'fix-group-member' into 'master' Dmitriy Zaporozhets2015-11-245-12/+51
|\
| * Small code improvementfix-group-memberDmitriy Zaporozhets2015-11-241-1/+1
| * Fix rubocop complainDmitriy Zaporozhets2015-11-241-1/+1
| * Fix 500 error when update group member permissionDmitriy Zaporozhets2015-11-245-12/+51
* | Merge branch 'issue_guidelines_with_omnibus_commands' into 'master' Dmitriy Zaporozhets2015-11-241-2/+2
|\ \ | |/ |/|
| * Spell out commands for omnibus-gitlab packages.issue_guidelines_with_omnibus_commandsMarin Jankovski2015-11-241-2/+2
* | Merge branch 'fix-small-text' into 'master' Dmitriy Zaporozhets2015-11-241-0/+6
|\ \ | |/ |/|
| * Fix ultra-light color for small textfix-small-textDmitriy Zaporozhets2015-11-241-0/+6
|/
* Merge branch 'service-tests' into 'master' Dmitriy Zaporozhets2015-11-242-0/+68
|\
| * Add tests for (Create|Update)ReleaseServiceservice-testsRobert Schilling2015-11-232-0/+68
* | Merge branch 'ci-artifacts-path' into 'master' Robert Speicher2015-11-237-6/+22
|\ \
| * | Expose artifacts pathci-artifacts-pathKamil Trzcinski2015-11-237-6/+22
* | | Merge branch 'ci-fix-500' into 'master' Robert Speicher2015-11-234-0/+10
|\ \ \
| * | | Update CHANGELOGRobert Speicher2015-11-231-0/+2
| * | | Fix 500 when using CIci-fix-500Kamil Trzcinski2015-11-234-0/+8
* | | | Merge branch 'fix-clipboard-styling-in-create-mr' into 'master' Robert Speicher2015-11-231-0/+4
|\ \ \ \
| * | | | Fix CSS styling for clipboard icon in new MR pageStan Hu2015-11-221-0/+4
| | |/ / | |/| |
* | | | Merge branch 'bundler-audit' into 'master' Dmitriy Zaporozhets2015-11-233-0/+14
|\ \ \ \
| * | | | Allow bundler:audit to failDmitriy Zaporozhets2015-11-231-0/+1
| * | | | Fix gitlab-ci.yml syntaxDmitriy Zaporozhets2015-11-231-3/+3
| * | | | Add bundler-audit to CIDmitriy Zaporozhets2015-11-233-0/+13
| | |/ / | |/| |
* | | | Merge branch 'required_version_and_docs_update' into 'master' Dmitriy Zaporozhets2015-11-236-43/+77
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add few fixes to documentation based on comments from reviewDmitriy Zaporozhets2015-11-232-4/+5
| * | | Update required version of lfs client and separate the docs for users and adm...required_version_and_docs_updateMarin Jankovski2015-11-206-43/+76
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-238-32/+196
|\ \ \ \
| * \ \ \ Merge branch 'issue_2296' into 'master' Douwe Maan2015-11-238-32/+196
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Little fix for Rubocop's complaints. #2296issue_2296Rubén Dávila2015-11-201-2/+2
| | * | | Fix bug that happened when replacing the Task list. #2296Rubén Dávila2015-11-202-1/+20
| | * | | Monkey patching TaskList::Item is no longer required. #2296Rubén Dávila2015-11-203-13/+4
| | * | | Refactor creation of system notes for Issue/MR labels. #2296Rubén Dávila2015-11-201-10/+7
| | * | | Generate system note after Task item has been updated on Issue or Merge Reque...Ruben Davila2015-11-199-24/+181
* | | | | Merge pull request #9843 from ferdinandrosario/upgradeDmitriy Zaporozhets2015-11-232-28/+28
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Updated rails patchFerdinand Rosario2015-11-192-28/+28
* | | | | Merge branch 'issue_2993' into 'master' Dmitriy Zaporozhets2015-11-232-2/+2
|\ \ \ \ \
| * | | | | Update copy used in alert message when deleting branches or tags. #2993issue_2993Rubén Dávila2015-11-192-2/+2
* | | | | | Merge branch 'issue-2831' into 'master' Douwe Maan2015-11-232-5/+11
|\ \ \ \ \ \
| * | | | | | Fix Assignee selector when 'Unassigned' #2831Jose Corcuera2015-11-202-5/+11
* | | | | | | Update doc/release/patch.md with more current patch proceduresRobert Speicher2015-11-221-8/+32
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'award_fix' into 'master' Robert Speicher2015-11-222-2/+2
|\ \ \ \ \ \
| * | | | | | Emoji bug: Invalid url to imageaward_fixValery Sizov2015-11-222-2/+2
* | | | | | | Merge branch 'fix-award-emoji-api' into 'master' Robert Speicher2015-11-225-10/+58
|\ \ \ \ \ \ \
| * | | | | | | Add upvote/downvote fields to merge request and note API to preserve compatib...fix-award-emoji-apiRobert Schilling2015-11-215-10/+58
* | | | | | | | Merge branch 'consistent-tags-api' into 'master' Stan Hu2015-11-217-24/+196
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Allow editing a release in API via PUT methodRobert Schilling2015-11-215-1/+112
| * | | | | | | Only allow to create a release if it does not exist yetRobert Schilling2015-11-214-8/+30
| * | | | | | | Use POST to create a new release instead of PUTRobert Schilling2015-11-213-8/+8
| * | | | | | | API: Return 404 if the tag for a release does not existRobert Schilling2015-11-215-9/+47
| * | | | | | | Make tag API consistent for release featureRobert Schilling2015-11-214-13/+14
* | | | | | | | Merge branch 'ci-doc-yaml' into 'master' Kamil Trzciński2015-11-211-49/+41
|\ \ \ \ \ \ \ \