summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Rewrite GitAccess for gitlab-shell v2Dmitriy Zaporozhets2014-09-013-13/+33
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-09-013-0/+66
|\
| * Merge branch 'milestone_percentage' into 'master'Dmitriy Zaporozhets2014-09-011-0/+2
| |\
| | * Show percentage status on milestone detail page, fixes #485Robert Schilling2014-08-171-0/+2
| * | Merge branch 'search-issues-spinach' into 'master'Dmitriy Zaporozhets2014-09-012-0/+64
| |\ \
| | * | Fixing requested changes for 'search issues by description' testsPorus Patell2014-08-252-33/+32
| | * | Adding Spinach tests for 'search issues by description field' featurePorus Patell2014-08-252-0/+65
* | | | Merge branch 'comment-and-close' into 'master'Dmitriy Zaporozhets2014-09-013-6/+37
|\ \ \ \ | |/ / / |/| | |
| * | | Post comment when hit close/reopen btn in comment formDmitriy Zaporozhets2014-09-013-6/+37
|/ / /
* | | Merge pull request #7409 from robbytaylor/feature/remove-redundant-spansDmitriy Zaporozhets2014-09-012-8/+6
|\ \ \
| * | | Removed redundant spansRob Taylor2014-07-312-8/+6
* | | | Merge pull request #7406 from robbytaylor/feature/group-row-paddingDmitriy Zaporozhets2014-09-011-1/+2
|\ \ \ \
| * | | | Moved padding from li to a in dashboard groups / projects listingRob Taylor2014-07-311-1/+2
| |/ / /
* | | | Merge pull request #7425 from Razer6/remove_dup_javascriptDmitriy Zaporozhets2014-09-011-24/+0
|\ \ \ \
| * | | | Remove duplicated setupNoteForm methodRobert Schilling2014-08-041-24/+0
* | | | | Merge pull request #7628 from zzet/update_markdownDmitriy Zaporozhets2014-09-012-3/+3
|\ \ \ \ \
| * | | | | Update redcarper gemAndrew Kumanyaev2014-08-282-3/+3
* | | | | | Merge pull request #7659 from Razer6/feature/shortcutsDmitriy Zaporozhets2014-09-0131-138/+646
|\ \ \ \ \ \
| * | | | | | Awesome shortcuts for GitLabRobert Schilling2014-09-0131-138/+646
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2014-09-011-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'double_quotes_empty_project' into 'master'Robert Schilling2014-08-311-1/+1
| |\ \ \ \ \ \
| | * | | | | | Modify empty project instructions to use double quotes for commit msg.Achilleas Pipinellis2014-08-311-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #7428 from bbodenmiller/patch-2Jeroen van Baarsen2014-08-311-29/+67
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | add prepare for upgrade sectionBen Bodenmiller2014-08-301-29/+67
* | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-08-303-3/+6
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #7639 from PeterDaveHello/patch-1Dmitriy Zaporozhets2014-08-301-0/+3
| |\ \ \ \ \ \ \
| | * | | | | | | make CI build fasterPeter Dave Hello2014-08-301-0/+3
| * | | | | | | | Merge pull request #7642 from cirosantilli/patch-5Robert Schilling2014-08-291-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Comment typo.Ciro Santilli2014-08-291-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge pull request #7641 from cirosantilli/patch-4Robert Schilling2014-08-291-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Comment typo.Ciro Santilli2014-08-291-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge pull request #7640 from PeterDaveHello/patch-2Robert Schilling2014-08-291-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Use svg instead of png to get better image qualityPeter Dave Hello2014-08-301-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'feature-ldap-tests' into 'master'Dmitriy Zaporozhets2014-08-306-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Move and rename ldap / oauth specsJan-Willem van der Meer2014-08-294-2/+3
| * | | | | | | | Rename ldap tests even furtherJan-Willem van der Meer2014-08-291-0/+0
| * | | | | | | | Fix naming convention of LDAP testsJan-Willem van der Meer2014-08-293-0/+0
* | | | | | | | | Merge branch 'ldap_allow_email' into 'master'Dmitriy Zaporozhets2014-08-304-29/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Add CHANGELOG entry for LDAP takeover deprecationJacob Vosmaer2014-08-291-0/+1
| * | | | | | | | Remove LDAP::Access#find_userJacob Vosmaer2014-08-292-28/+1
| * | | | | | | | Disable allow_username_or_email_login in exampleJacob Vosmaer2014-08-291-1/+1
* | | | | | | | | Merge pull request #7221 from mcmillion/fix-issue-comment-rss-feedDmitriy Zaporozhets2014-08-294-5/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix missing links and incorrect display of issue numbers for notes, comments,...Matthew McMillion2014-07-264-5/+11
* | | | | | | | | | Merge pull request #7634 from zzet/patch-11Dmitriy Zaporozhets2014-08-291-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return extra empty line in blob renderAndrew Kumanyaev2014-08-291-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #7517 from jvanbaarsen/guard-spring-fixDmitriy Zaporozhets2014-08-293-5/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Updated the spring gem and fixed the guard fileJeroen van Baarsen2014-08-163-5/+5
* | | | | | | | | | | Merge pull request #7519 from jvanbaarsen/enable-blame-highlightingDmitriy Zaporozhets2014-08-291-5/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Enable highlighting for blameJeroen van Baarsen2014-08-251-5/+6
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'deny-system-notes-edit' into 'master'Dmitriy Zaporozhets2014-08-293-5/+13
|\ \ \ \ \ \ \ \ \ \