summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'jk-assignees-todos-fix' into 'master'Sean McGivern2017-10-092-5/+6
|\ | | | | | | | | CE Backport of "Don't create todos for old issue assignees" See merge request gitlab-org/gitlab-ce!14765
| * Don't create todos for old issue assigneesJarka Kadlecova2017-10-092-5/+6
| |
* | Merge branch '23888-fix-unsubscription-link-for-snippet-notification' into ↵Sean McGivern2017-10-091-1/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Don't show an "Unsubscribe" link in snippet comment notifications Closes #23888 See merge request gitlab-org/gitlab-ce!14764
| * | Don't show an "Unsubscribe" link in snippet comment notificationsRémy Coutable2017-10-091-1/+5
| |/ | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'group-sort-dropdown-blank' into 'master'Robert Speicher2017-10-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fixed default group sort option Closes #38808 See merge request gitlab-org/gitlab-ce!14728
| * \ Merge branch 'master' into 'group-sort-dropdown-blank'Robert Speicher2017-10-09205-1401/+3909
| |\ \ | | |/ | | | | | | # Conflicts: # spec/features/dashboard/group_spec.rb
| * | Fixed default group sort optiongroup-sort-dropdown-blankPhil Hughes2017-10-061-1/+1
| | | | | | | | | | | | Closes #38808
* | | Merge branch '37483-activity-log-show-wrong-number-of-commits-per-push' into ↵Rémy Coutable2017-10-091-2/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | 'master' Fix the number representing the amount of commits related to a push event Closes #37483 See merge request gitlab-org/gitlab-ce!14103
| * | Fix the number representing the amount of commits related to a push eventMark Fletcher2017-10-061-2/+1
| | |
* | | Merge branch 'icons-update-fix-regression-on-groups' into 'master'Phil Hughes2017-10-093-3/+3
|\ \ \ | | | | | | | | | | | | | | | | Updated Icons + Fix for Collapsed Groups Angle See merge request gitlab-org/gitlab-ce!14754
| * | | Updated Icons + Fix for Collapsed Groups Angleicons-update-fix-regression-on-groupsTim Zallmann2017-10-093-3/+3
| | | |
* | | | Removes CommitsList from global namespaceFilipa Lacerda2017-10-092-26/+27
| | | |
* | | | Merge branch 'abuse-reports-module' into 'master'Filipa Lacerda2017-10-093-6/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Convert AbuseReports class to a module See merge request gitlab-org/gitlab-ce!14709
| * | | | Convert AbuseReports class to a moduleabuse-reports-modulePhil Hughes2017-10-063-6/+3
| | | | |
* | | | | Remove AjaxLoadingSpinner and CreateLabelDropdown from global namespaceFilipa Lacerda2017-10-096-34/+29
| | | | |
* | | | | Merge branch 'sh-show-all-slack-names' into 'master'Robert Speicher2017-10-097-16/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include GitLab full name with username in Slack messages Closes #38865 See merge request gitlab-org/gitlab-ce!14740
| * | | | | Include GitLab full name with username in Slack messagessh-show-all-slack-namesStan Hu2017-10-067-16/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to include the first and last name of the user, but !6624 modified this to include only the username. Let's compromise and add both in the form of `First Last (username)`. Closes #38865
* | | | | | Move cycle analytics banner into a vue fileFilipa Lacerda2017-10-093-12/+60
| |_|/ / / |/| | | |
* | | | | Merge branch '38890-fix-gpg-signature-updater-when-commit-is-missing' into ↵Stan Hu2017-10-071-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error with GPG signature updater when commit was deleted Closes #38890 See merge request gitlab-org/gitlab-ce!14749
| * | | | | Fix error with GPG signature updater when commit was deleted38890-fix-gpg-signature-updater-when-commit-is-missingRubén Dávila2017-10-071-0/+2
| | | | | |
* | | | | | Merge branch 'cleanup_old_nav_stuff' into 'master'Filipa Lacerda2017-10-0723-926/+501
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Remove old navigation CSS See merge request gitlab-org/gitlab-ce!14573
| * | | | | Fix dropdown header alignment; empty navbar positioningcleanup_old_nav_stuffAnnabel Dunstone Gray2017-10-072-18/+18
| | | | | |
| * | | | | Specify gitlab navAnnabel Dunstone Gray2017-10-062-6/+6
| | | | | |
| * | | | | Finish combining nav stylesAnnabel Dunstone Gray2017-10-066-479/+414
| | | | | |
| * | | | | Fix specsAnnabel Dunstone Gray2017-10-062-0/+6
| | | | | |
| * | | | | Conflict fixesAnnabel Dunstone Gray2017-10-061-4/+4
| | | | | |
| * | | | | Start moving new nav styles into header.scssAnnabel Dunstone Gray2017-10-0613-268/+76
| | | | | |
| * | | | | FixesAnnabel Dunstone Gray2017-10-065-129/+130
| | | | | |
| * | | | | Fix scrolling tabsAnnabel Dunstone Gray2017-10-062-0/+8
| | | | | |
| * | | | | Remove nav images; remove old nav styles; create new file for other ↵Annabel Dunstone Gray2017-10-0610-526/+343
| |/ / / / | | | | | | | | | | | | | | | navigation elements
* | | | | Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-0713-26/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create idea of read-only database Closes #37534 See merge request gitlab-org/gitlab-ce!14688
| * | | | | Create idea of read-only databasetc-geo-read-only-ideaToon Claes2017-10-0613-26/+85
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GitLab EE, a GitLab instance can be read-only (e.g. when it's a Geo secondary node). But in GitLab CE it also might be useful to have the "read-only" idea around. So port it back to GitLab CE. Also having the principle of read-only in GitLab CE would hopefully lead to less errors introduced, doing write operations when there aren't allowed for read-only calls. Closes gitlab-org/gitlab-ce#37534.
* | | | | Show fork information on the project panelBob Van Landuyt2017-10-071-4/+10
| | | | |
* | | | | Store the name of a project that's a root of a fork networkBob Van Landuyt2017-10-071-0/+7
| | | | | | | | | | | | | | | | | | | | So we can keep showing it to a user in his project page.
* | | | | Find forks within users/namespaces using fork membershipsBob Van Landuyt2017-10-074-10/+13
| | | | |
* | | | | Remove membership from fork network when unlinkingBob Van Landuyt2017-10-071-0/+1
| | | | |
* | | | | Find branches in all projects in the fork networkBob Van Landuyt2017-10-072-3/+6
| | | | |
* | | | | Allow creating merge requests across forks of a projectBob Van Landuyt2017-10-074-4/+34
| | | | |
* | | | | Create a fork network when forking a projectBob Van Landuyt2017-10-074-3/+47
| | | | | | | | | | | | | | | | | | | | | | | | | When no fork network exists for the source projects, we create a new one with the correct source
* | | | | Add a model for `fork_networks`Bob Van Landuyt2017-10-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | The fork network will keep track of the root project as long as it's present.
* | | | | Merge branch 'master' into '37970-ci-sections-tracking'Kamil Trzciński2017-10-07213-776/+3686
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | | | Commenting on image diffsFelipe Artur2017-10-0745-183/+1114
| | | | | |
| * | | | | Merge branch 'fl-38869-linked-tabs' into 'master'Mike Greiling2017-10-061-3/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes unnecessary load of LinkedTabs, Pipelines and MiniPipelineGraph classes See merge request gitlab-org/gitlab-ce!14734
| | * \ \ \ \ Merge branch 'master' into fl-38869-linked-tabsfl-38869-linked-tabsFilipa Lacerda2017-10-0685-123/+1551
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (136 commits) Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener spec Gitaly feature flag metadata Add delete issue docs Adjust tooltips to adhere to 8px grid and make them more readable Fix JS lock issue specs Improve redirect uri state and fix all remaining tests Add 1000+ counters (instead of inifnite) to jobs controller Use short path project_clusters_url Change Clusters to Cluster in sidebar Security fix: redirection in google_api/authorizations_controller UX review Fix sidebar title Fix fixture Fix margins in edit form Use utc for time comparision Good old dangling comma Fix wording in the js messages Resetting of active Line + setting it for the async display functions Add some empty spaces Fix failing spec Refactor discussion lock docs ...
| | * | | | | Removes unnecessary load of LinkedTabs, Pipelines and MiniPipelineGraph classesFilipa Lacerda2017-10-061-3/+0
| | | | | | |
| * | | | | | Merge branch ↵Fatih Acet2017-10-062-1/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '36255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-all' into 'master' Resolve "Metrics that do not have a complete history are not shown at all" Closes #36255 See merge request gitlab-org/gitlab-ce!14741
| | * | | | | | allow legend to properly handle NaN valuesMike Greiling2017-10-061-1/+5
| | | | | | | |
| | * | | | | | allow prometheus graphs to handle non-congiuous paths (with NaN, +Inf, and -Inf)Mike Greiling2017-10-061-0/+4
| | | |/ / / / | | |/| | | |
| * | | | | | Show confirmation modal before deleting accountWinnie Hellmann2017-10-0610-20/+226
| |/ / / / /
| * | | | | Merge branch 'ide-fix-back-btn' into 'master'Fatih Acet2017-10-066-19/+62
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repo Editor : Fixes Back Button for files + line number jumping for preview and editor See merge request gitlab-org/gitlab-ce!14508
View Lorry Controller Status