Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #6970 from skv-headless/fix_ctrl_enter_notes_send | Dmitriy Zaporozhets | 2014-05-14 | 1 | -1/+1 |
|\ | |||||
| * | fix ctrl+enter note send | Evgeniy Sokovikov | 2014-05-14 | 1 | -1/+1 |
* | | Merge branch 'gzip_assets_warning' into 'master' | Sytse Sijbrandij | 2014-05-14 | 4 | -19/+12 |
|\ \ | |/ |/| | |||||
| * | Update warnings about relative url support. | Marin Jankovski | 2014-05-13 | 4 | -20/+12 |
| * | Add warning to gitlab.yml related to gzip assets and relative links. | Marin Jankovski | 2014-05-13 | 1 | -0/+1 |
* | | Remove text-shadow from header | Dmitriy Zaporozhets | 2014-05-13 | 3 | -6/+0 |
* | | Merge branch 'green-theme' into 'master' | Dmitriy Zaporozhets | 2014-05-13 | 2 | -8/+13 |
|\ \ | |/ |/| | |||||
| * | Green theme instead of dark | Dmitriy Zaporozhets | 2014-05-13 | 2 | -8/+13 |
* | | Merge branch 'improve-jira-linking' into 'master' | Marin Jankovski | 2014-05-13 | 4 | -6/+70 |
|\ \ | |/ |/| | |||||
| * | Better name for config variable. | Marin Jankovski | 2014-05-13 | 1 | -2/+2 |
| * | Add support for Jira ticket mentions in format JIRA-123. | Marin Jankovski | 2014-05-13 | 4 | -6/+70 |
* | | Change diff header bg | Dmitriy Zaporozhets | 2014-05-13 | 1 | -9/+3 |
* | | Improve file title | Dmitriy Zaporozhets | 2014-05-13 | 1 | -7/+7 |
* | | Merge branch 'improve-violet-theme' into 'master' | Dmitriy Zaporozhets | 2014-05-13 | 2 | -9/+9 |
|\ \ | |/ |/| | |||||
| * | Improve violet theme | Dmitriy Zaporozhets | 2014-05-13 | 2 | -9/+9 |
|/ | |||||
* | Merge pull request #6778 from dblessing/feature/mr_labels | Dmitriy Zaporozhets | 2014-05-13 | 15 | -17/+142 |
|\ | |||||
| * | Implement Merge Request Labels | Drew Blessing | 2014-05-13 | 15 | -17/+142 |
* | | Merge branch 'api-mr-merge' into 'master' | Dmitriy Zaporozhets | 2014-05-13 | 4 | -5/+119 |
|\ \ | |||||
| * | | More tests for merge api | Dmitriy Zaporozhets | 2014-05-13 | 1 | -0/+15 |
| * | | Add some tests for merge API | Dmitriy Zaporozhets | 2014-05-13 | 3 | -6/+14 |
| * | | Docs for merge api | Dmitriy Zaporozhets | 2014-05-12 | 2 | -0/+49 |
| * | | Specify error codes for merge api | Dmitriy Zaporozhets | 2014-05-12 | 1 | -9/+12 |
| * | | Draft API method for merge MR | Dmitriy Zaporozhets | 2014-05-12 | 1 | -0/+39 |
* | | | Merge pull request #6109 from jamit/master | Dmitriy Zaporozhets | 2014-05-13 | 5 | -0/+46 |
|\ \ \ | |||||
| * | | | Added some tests. | Philip Blatter | 2014-05-05 | 1 | -0/+20 |
| * | | | Now using correct ids as reference if we are informing about a new note. | Philip Blatter | 2014-05-05 | 1 | -2/+2 |
| * | | | Added email threading for update emails on issues and merge requests (if the ... | Philip Blatter | 2014-05-05 | 4 | -0/+26 |
* | | | | Merge pull request #6045 from jacargentina/fix-4305 | Dmitriy Zaporozhets | 2014-05-13 | 2 | -4/+4 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'upstream/master' into fix-4305 | Javier Castro | 2014-03-04 | 802 | -167930/+10219 |
| |\ \ \ \ | |||||
| * | | | | | Temporary fix for #4305: Cant preview attached png images on notes; attachmen... | Javier Castro | 2014-01-14 | 2 | -4/+4 |
* | | | | | | Merge pull request #6385 from cirosantilli/72-char-commit-msg | Dmitriy Zaporozhets | 2014-05-13 | 7 | -5/+38 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Commit message textareas have 72 char mark line. | Ciro Santillli | 2014-04-16 | 7 | -5/+38 |
* | | | | | | | Merge pull request #6825 from sue445/feature/post_automerge | Dmitriy Zaporozhets | 2014-05-13 | 4 | -4/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix can not automerge if description is too long | sue445 | 2014-05-11 | 4 | -4/+8 |
* | | | | | | | | Merge pull request #6823 from milgner/api_expose_project_archived_status | Dmitriy Zaporozhets | 2014-05-13 | 2 | -3/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add info about exposed Project::archived to API docs | Marcus Ilgner | 2014-04-20 | 1 | -3/+6 |
| * | | | | | | | | Expose archive status of projects in API | Marcus Ilgner | 2014-04-18 | 1 | -0/+1 |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-05-13 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'use_ldap_uid_as_username_instead_of_first_part_of_email_address... | Dmitriy Zaporozhets | 2014-05-13 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| | * | | | | | | | | Use uid as username when creating user with LDAP | Julien Pivotto | 2014-05-12 | 1 | -1/+3 |
* | | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2014-05-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #6959 from dtan4/fix-dead-links | Dmitriy Zaporozhets | 2014-05-13 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Fix dead links in ruby.md | dtan4 | 2014-05-12 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'api-wrapper' into 'master' | Dmitriy Zaporozhets | 2014-05-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Let people know that Nihad Abbasov made a nice api wrapper. | dosire | 2014-05-13 | 1 | -1/+1 |
|/ / / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2014-05-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into 'master' | Jacob Vosmaer | 2014-05-12 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Fix typo | Pascal Herbert | 2014-05-11 | 1 | -2/+2 |
| | | |_|/ / / / / / | | |/| | | | | | | | |||||
* | | | | | | | | | | Merge branch 'changelog-satellite' into 'master' | Dmitriy Zaporozhets | 2014-05-12 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add changelog entry for satellite clean. | dosire | 2014-05-12 | 1 | -0/+1 |
|/ / / / / / / / / / |