summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix missing ignored? for GenericCommitStatuscommit-status-fixKamil Trzcinski2016-02-192-4/+4
* Merge branch 'ci/api-runners' into 'master' Kamil Trzciński2016-02-191-0/+6
|\
| * Change interpolation to named placeholder in owned_or_shared scopeTomasz Maczukin2016-02-191-1/+1
| * Add basic runners management APITomasz Maczukin2016-02-191-0/+6
* | Merge branch 'issue_11872' into 'master' Jacob Schatz2016-02-192-17/+13
|\ \ | |/ |/|
| * Move visibility icon next to project titleissue_11872Alfredo Sumaran2016-02-182-17/+13
* | Project limit is reached warning is hidden when the projects_limit is zeroZeger-Jan van de Weg2016-02-191-1/+1
* | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-194-1276/+1724
|\ \
| * | Update Emoji sprite and its SCSS for new stylesrs-emojiRobert Speicher2016-02-172-1269/+1723
| * | Update Emoji asset pathRobert Speicher2016-02-121-1/+1
| * | Remove unused emoji_autocomplete_source helperRobert Speicher2016-02-121-6/+0
* | | Merge branch 'fix/project-forks-page' into 'master' Douwe Maan2016-02-191-1/+1
|\ \ \
| * | | update based on feedbackJames Lopez2016-02-192-2/+2
| * | | updated fix based on MR feedbackJames Lopez2016-02-173-5/+3
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-for...James Lopez2016-02-1726-146/+217
| |\ \ \
| * | | | workaround for forks with an invalid repo - avoid showing them in the listJames Lopez2016-02-161-1/+3
* | | | | Merge branch 'rs-show-owner-label' into 'master' Douwe Maan2016-02-191-1/+1
|\ \ \ \ \
| * | | | | Allow `ProjectTeam#human_max_access` to return "Owner"rs-show-owner-labelRobert Speicher2016-02-181-1/+1
* | | | | | number_with_delimiter() addedheiko2016-02-191-2/+2
| |_|_|_|/ |/| | | |
* | | | | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-181-36/+18
|/ / / /
* | | | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-181-18/+36
|\ \ \ \
| * | | | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-181-18/+36
* | | | | Merge branch 'autocrlf-lazy' into 'master' Robert Speicher2016-02-181-9/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Handle raw_repository returning nil in exists?autocrlf-lazyYorick Peterse2016-02-181-0/+2
| * | | | Use Repository#exists? in Repository#commit?Yorick Peterse2016-02-181-1/+1
| * | | | Fixed Repository#exists? to handle errorsYorick Peterse2016-02-181-6/+5
| * | | | Only set autocrlf when creating/updating filesYorick Peterse2016-02-181-3/+7
* | | | | Uses cross browser niceScroll to do scrolling on sidebar.Jacob Schatz2016-02-182-16/+2
* | | | | Merge branch 'fix/ci-first-job-allow-failure' into 'master' Kamil Trzciński2016-02-181-0/+1
|\ \ \ \ \
| * | | | | Return a builds array in builds create serviceGrzegorz Bizon2016-02-181-0/+1
* | | | | | Merge branch 'rs-git-fetch-labels' into 'master' Kamil Trzciński2016-02-181-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix labels for git clone/git fetch Project CI settingrs-git-fetch-labelsRobert Speicher2016-02-161-2/+2
* | | | | | Merge branch 'fix/gitpushservice-complexity-issue' into 'master' Douwe Maan2016-02-182-58/+62
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | refactored some stuff based on MR feedbackJames Lopez2016-02-172-9/+4
| * | | | | refactored GitPushService and updated specJames Lopez2016-02-152-29/+25
| * | | | | typoJames Lopez2016-02-121-1/+1
| * | | | | attempt to reduce code complexity on GitPushService#executeJames Lopez2016-02-112-54/+67
* | | | | | Reopened MRs should also be considered as open.issue_13539Rubén Dávila2016-02-171-1/+1
* | | | | | Merge branch 'see-and-sort-on-vote-count-mr-issues' into 'master' Douwe Maan2016-02-177-3/+88
|\ \ \ \ \ \
| * | | | | | Add ability to see and sort on vote count from Issues and MR listssee-and-sort-on-vote-count-mr-issuesDouglas Barbosa Alexandre2016-02-177-3/+88
* | | | | | | Merge branch 'git-archive-refactor' into 'master' Douwe Maan2016-02-172-24/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...git-archive-refactorJacob Vosmaer2016-02-1712-26/+93
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-arc...Jacob Vosmaer2016-02-17181-981/+1795
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| * | | | | | | First version of "git archive" headersJacob Vosmaer2016-02-022-24/+3
* | | | | | | | Merge branch 'bugfix/jschatz1/milestone-icon' into 'master' Rémy Coutable2016-02-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Correct icon for milestones.bugfix/jschatz1/milestone-iconJacob Schatz2016-02-171-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' int...Douwe Maan2016-02-171-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Sort line notes used in parallel diff by created_atRémy Coutable2016-02-171-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'fix/13367-redirect-to-project-page-if-no-import' into 'master' Douwe Maan2016-02-172-3/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Redirect /import to project page if no importing at all and repo existsfix/13367-redirect-to-project-page-if-no-importRémy Coutable2016-02-172-3/+13
| |/ / / / / /
View Lorry Controller Status