summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)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
|\ | | | | | | | | | | | | Add runners API References #4264 See merge request !2640
| * 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
| | | | | | | | | | | | | | - add feature to list runners - add feature to show runners details - add feature to delete runner - add feature to update runner
* | Merge branch 'issue_11872' into 'master' Jacob Schatz2016-02-192-17/+13
|\ \ | |/ |/| | | | | | | | | Put project visibility icon next to title Fixes #11872 See merge request !2885
| * 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
| | | | | | | | Fixes #12791
* | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-194-1276/+1724
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Update Gemojione for new hotness :sparkles: Before | After ------ | ----- ![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png) See merge request !2800
| * | Update Emoji sprite and its SCSS for new stylesrs-emojiRobert Speicher2016-02-172-1269/+1723
| | |
| * | Update Emoji asset pathRobert Speicher2016-02-121-1/+1
| | | | | | | | | | | | | | | Now that we're serving assets directly from the Gemojione gem's path, the images are not in an `emoji/` sub-folder.
| * | 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
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | workaround for forks with an invalid repo Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13465 The error occurs when a project returns a `nil` commit for a variety of reasons, I assume the repository is corrupt - perhaps as a result of a failed fork. With this MR, we do not show forks with corrupted repos in the list of forks, as this does not seem to work anyway. A better solution is to fix the cause of the issue and/or any data integrity problem... Also fixing Sentry issue: 1180 `undefined method 'already_forked?' for nil:NilClass ` See merge request !2836
| * | | 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 ↵James Lopez2016-02-1726-146/+217
| |\ \ \ | | | | | | | | | | | | | | | fix/project-forks-page
| * | | | 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" See merge request !2881
| * | | | | 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
|/ / / / | | | | | | | | | | | | | | | | This reverts commit c04e22fba8d130a58f498ff48127712d7dae17ee, reversing changes made to 0feab326d52222dc0ab5bd0a6b15dab297f44aa9.
* | | | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-181-18/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decouple SAML authentication from the default Omniauth logic Fixes gitlab-org/gitlab-ee#178 With this merge request SAML gets its own login logic and its own `User` class under `lib/gitlab/saml/` This is needed to give SAML more versatility over how the authorization process works and to pave the way for the development of a SAML group sync as outlined here: gitlab-org/gitlab-ee#118 See merge request !2782
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only set autocrlf when creating/updating files Related issue: gitlab-org/gitlab-ce#13457 Details: 5619a6de1dd6fc1dfd4053810c7b11c677b7a495 See merge request !2859
| * | | | Handle raw_repository returning nil in exists?autocrlf-lazyYorick Peterse2016-02-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If path_with_namespace is nil Repository#raw_repository will also return nil. Apparently code out there creates a Repository instance without a namespace path. Right.
| * | | | Use Repository#exists? in Repository#commit?Yorick Peterse2016-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Just checking raw_repository is no longer accurate to determine if a repository exists or not.
| * | | | Fixed Repository#exists? to handle errorsYorick Peterse2016-02-181-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Repository#raw_repository no longer sets the autocrlf option it will also no longer raise any NoRepository errors since it doesn't access Rugged any more. This also means that Repository#exists? can't simply return the raw repository as this is no indication of whether or not the repository actually exists (besides returning a non boolean is weird in the first place). To solve this problem Repository#exists? now properly checks if the repository exists and returns true/false instead of a Gitlab::Git::Repository or nil object.
| * | | | Only set autocrlf when creating/updating filesYorick Peterse2016-02-181-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting the "autocrlf" Git option is an overkill since it's rarely actually needed. More importantly, it has quite the impact on performance (see gitlab-org/gitlab-ce#13457 for more information). By setting "autocrlf" when creating or updating files we guarantee the option is always set properly when we actually need it _without_ introducing overhead for requests that have nothing to do with this option. Fixes gitlab-org/gitlab-ce#13457
* | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix CI builds scheduler when first build in stage is allowed to fail This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail. Closes #3192 See merge request !2869
| * | | | | 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 setting See merge request !2842
| * | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce code complexity on GitPushService#execute Code complexity for gitlab-ce after this has been refactored: ``` 27.3: GitPushService#execute ``` This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that? I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13327 See merge request !2784
| * | | | | 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 lists Fixes #3763 * Sort options ![Sort Options](/uploads/df6543d574d4df8bf7e4496a876e2930/sort.png) * Most popular ![Most popular](/uploads/bb92cc2fbef7b6b806dcdf8c52778fdd/most-popular.png) * Least popular ![Least popular](/uploads/7988ed451922c81dc228419b5edbd7cd/least-popular.png) See merge request !2781
| * | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor 'git archive' hand-off to gitlab-workhorse We have a nicer way now to hand off HTTP responses to gitlab-workhorse. Companion MR: https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/36 See merge request !2675
| * | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-refactorJacob Vosmaer2016-02-1712-26/+93
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git-archive-refactor
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Jacob Vosmaer2016-02-17181-981/+1795
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | | | | | | | | git-archive-refactor
| * | | | | | | 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. See merge request !2856
| * | | | | | | | 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' ↵Douwe Maan2016-02-171-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Sort line notes used in parallel diff by created_at Fixes #13464. See merge request !2858
| * | | | | | | | Sort line notes used in parallel diff by created_atRémy Coutable2016-02-171-1/+1
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes #13464.
* | | | | | | | 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 exists Fixes gitlab-org/gitlab-ce#13367. See merge request !2857
| * | | | | | | 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
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes #13367.
View Lorry Controller Status