summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6970 from skv-headless/fix_ctrl_enter_notes_sendDmitriy Zaporozhets2014-05-141-1/+1
|\
| * fix ctrl+enter note sendEvgeniy Sokovikov2014-05-141-1/+1
* | Merge branch 'gzip_assets_warning' into 'master'Sytse Sijbrandij2014-05-144-19/+12
|\ \ | |/ |/|
| * Update warnings about relative url support.Marin Jankovski2014-05-134-20/+12
| * Add warning to gitlab.yml related to gzip assets and relative links.Marin Jankovski2014-05-131-0/+1
* | Remove text-shadow from headerDmitriy Zaporozhets2014-05-133-6/+0
* | Merge branch 'green-theme' into 'master'Dmitriy Zaporozhets2014-05-132-8/+13
|\ \ | |/ |/|
| * Green theme instead of darkDmitriy Zaporozhets2014-05-132-8/+13
* | Merge branch 'improve-jira-linking' into 'master'Marin Jankovski2014-05-134-6/+70
|\ \ | |/ |/|
| * Better name for config variable.Marin Jankovski2014-05-131-2/+2
| * Add support for Jira ticket mentions in format JIRA-123.Marin Jankovski2014-05-134-6/+70
* | Change diff header bgDmitriy Zaporozhets2014-05-131-9/+3
* | Improve file titleDmitriy Zaporozhets2014-05-131-7/+7
* | Merge branch 'improve-violet-theme' into 'master'Dmitriy Zaporozhets2014-05-132-9/+9
|\ \ | |/ |/|
| * Improve violet themeDmitriy Zaporozhets2014-05-132-9/+9
|/
* Merge pull request #6778 from dblessing/feature/mr_labelsDmitriy Zaporozhets2014-05-1315-17/+142
|\
| * Implement Merge Request LabelsDrew Blessing2014-05-1315-17/+142
* | Merge branch 'api-mr-merge' into 'master'Dmitriy Zaporozhets2014-05-134-5/+119
|\ \
| * | More tests for merge apiDmitriy Zaporozhets2014-05-131-0/+15
| * | Add some tests for merge APIDmitriy Zaporozhets2014-05-133-6/+14
| * | Docs for merge apiDmitriy Zaporozhets2014-05-122-0/+49
| * | Specify error codes for merge apiDmitriy Zaporozhets2014-05-121-9/+12
| * | Draft API method for merge MRDmitriy Zaporozhets2014-05-121-0/+39
* | | Merge pull request #6109 from jamit/masterDmitriy Zaporozhets2014-05-135-0/+46
|\ \ \
| * | | Added some tests.Philip Blatter2014-05-051-0/+20
| * | | Now using correct ids as reference if we are informing about a new note.Philip Blatter2014-05-051-2/+2
| * | | Added email threading for update emails on issues and merge requests (if the ...Philip Blatter2014-05-054-0/+26
* | | | Merge pull request #6045 from jacargentina/fix-4305Dmitriy Zaporozhets2014-05-132-4/+4
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into fix-4305Javier Castro2014-03-04802-167930/+10219
| |\ \ \ \
| * | | | | Temporary fix for #4305: Cant preview attached png images on notes; attachmen...Javier Castro2014-01-142-4/+4
* | | | | | Merge pull request #6385 from cirosantilli/72-char-commit-msgDmitriy Zaporozhets2014-05-137-5/+38
|\ \ \ \ \ \
| * | | | | | Commit message textareas have 72 char mark line.Ciro Santillli2014-04-167-5/+38
* | | | | | | Merge pull request #6825 from sue445/feature/post_automergeDmitriy Zaporozhets2014-05-134-4/+8
|\ \ \ \ \ \ \
| * | | | | | | Fix can not automerge if description is too longsue4452014-05-114-4/+8
* | | | | | | | Merge pull request #6823 from milgner/api_expose_project_archived_statusDmitriy Zaporozhets2014-05-132-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Add info about exposed Project::archived to API docsMarcus Ilgner2014-04-201-3/+6
| * | | | | | | | Expose archive status of projects in APIMarcus Ilgner2014-04-181-0/+1
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-05-131-1/+3
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'use_ldap_uid_as_username_instead_of_first_part_of_email_address...Dmitriy Zaporozhets2014-05-131-1/+3
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | Use uid as username when creating user with LDAPJulien Pivotto2014-05-121-1/+3
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-05-131-2/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #6959 from dtan4/fix-dead-linksDmitriy Zaporozhets2014-05-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix dead links in ruby.mddtan42014-05-121-2/+2
* | | | | | | | | | | Merge branch 'api-wrapper' into 'master'Dmitriy Zaporozhets2014-05-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Let people know that Nihad Abbasov made a nice api wrapper.dosire2014-05-131-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-05-121-2/+2
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'master'Jacob Vosmaer2014-05-121-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fix typoPascal Herbert2014-05-111-2/+2
| | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge branch 'changelog-satellite' into 'master'Dmitriy Zaporozhets2014-05-121-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add changelog entry for satellite clean.dosire2014-05-121-0/+1
|/ / / / / / / / / /