summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove executable permissions on images to make docs lint happysh-remove-ux-chmod-permissionsStan Hu2017-10-0711-0/+0
| | | | [ci skip]
* Merge branch 'cleanup_old_nav_stuff' into 'master'Filipa Lacerda2017-10-0724-932/+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
| |
| * Remove unnecessary testkushalpandya2017-10-061-6/+0
| |
| * 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 'patch-28' into 'master'Douwe Maan2017-10-071-2/+2
|\ \ | | | | | | | | | | | | Fix LDAP config key name See merge request gitlab-org/gitlab-ce!14739
| * | Fix LDAP config key nameMichael Kozono2017-10-061-2/+2
| |/
* | Merge branch 'tc-geo-read-only-idea' into 'master'Douwe Maan2017-10-0734-86/+546
|\ \ | | | | | | | | | | | | | | | | | | 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-0634-86/+546
| |/ | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'bvl-fork-network-schema' into 'master'Douwe Maan2017-10-0780-260/+1368
|\ \ | | | | | | | | | | | | | | | | | | Create merge requests across a fork network Closes #20097 See merge request gitlab-org/gitlab-ce!14422
| * | Add a spec for editing a file when a project was already forkedBob Van Landuyt2017-10-071-1/+31
| | |
| * | Show fork information on the project panelBob Van Landuyt2017-10-073-6/+135
| | |
| * | Store the name of a project that's a root of a fork networkBob Van Landuyt2017-10-072-0/+20
| | | | | | | | | | | | So we can keep showing it to a user in his project page.
| * | Find forks within users/namespaces using fork membershipsBob Van Landuyt2017-10-078-10/+70
| | |
| * | Remove membership from fork network when unlinkingBob Van Landuyt2017-10-072-8/+23
| | |
| * | Add a migration to populate fork networksBob Van Landuyt2017-10-075-0/+346
| | | | | | | | | | | | This uses the existing ForkedProjectLinks
| * | Add a project forks spec helperBob Van Landuyt2017-10-0747-225/+308
| | | | | | | | | | | | | | | The helper creates a fork of a project with all provided attributes, but skipping the creation of the repository on disk.
| * | Find branches in all projects in the fork networkBob Van Landuyt2017-10-073-3/+25
| | |
| * | Allow creating merge requests across forks of a projectBob Van Landuyt2017-10-0713-28/+230
| | |
| * | Create a fork network when forking a projectBob Van Landuyt2017-10-079-6/+160
| | | | | | | | | | | | | | | 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-075-0/+47
|/ / | | | | | | | | The fork network will keep track of the root project as long as it's present.
* | Merge branch '37970-ci-sections-tracking' into 'master'Kamil Trzciński2017-10-0731-3/+603
|\ \ | | | | | | | | | | | | | | | | | | Add CI build trace sections extractor Closes #37970 See merge request gitlab-org/gitlab-ce!14511
| * \ Merge branch 'master' into '37970-ci-sections-tracking'Kamil Trzciński2017-10-07538-2841/+13262
| |\ \ | |/ / |/| | | | | # Conflicts: # db/schema.rb
* | | Merge branch 'issue_35873' into 'master'Jacob Schatz2017-10-0777-270/+3318
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Commenting on image diffs Closes #35873 and #38559 See merge request gitlab-org/gitlab-ce!14061
| * | | Commenting on image diffsFelipe Artur2017-10-0777-270/+3318
|/ / /
* | | Merge branch 'backport-protected-branches-spec-changes' into 'master'Mike Greiling2017-10-061-9/+17
|\ \ \ | | | | | | | | | | | | | | | | Backport protected_branches_spec improvements from EE See merge request gitlab-org/gitlab-ce!14745
| * | | backport protected_branches_spec improvements from EEbackport-protected-branches-spec-changesJose Ivan Vargas2017-10-061-9/+17
| | | |
* | | | 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-06195-1163/+5187
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-063-1/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | add CHANGELOG.md entry for !1474136255-metrics-that-do-not-have-a-complete-history-are-not-shown-at-allMike Greiling2017-10-061-0/+5
| | | | |
| * | | | 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
| | |/ / | |/| |
* | | | Merge branch 'winh-delete-account-modal' into 'master'Fatih Acet2017-10-0617-30/+507
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Show confirmation modal before deleting account Closes #13482 and #38754 See merge request gitlab-org/gitlab-ce!14360
| * | | Show confirmation modal before deleting accountWinnie Hellmann2017-10-0617-30/+507
|/ / /
* | | Merge branch '38872-fix-rspec-flaky-spec' into 'master'Stan Hu2017-10-061-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener spec Closes #38872 See merge request gitlab-org/gitlab-ce!14736
| * | | Ensure we set SUITE_FLAKY_RSPEC_REPORT_PATH to nil in RspecFlaky::Listener specRémy Coutable2017-10-061-0/+1
|/ / / | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'ide-fix-back-btn' into 'master'Fatih Acet2017-10-069-34/+124
|\ \ \ | | | | | | | | | | | | | | | | Repo Editor : Fixes Back Button for files + line number jumping for preview and editor See merge request gitlab-org/gitlab-ce!14508
| * | | Good old dangling commaide-fix-back-btnTim Zallmann2017-10-061-1/+1
| | | |
| * | | Resetting of active Line + setting it for the async display functionsTim Zallmann2017-10-063-13/+22
| | | |
| * | | Fixed Linting Error + Error with Line Highlighter found in TestTim Zallmann2017-10-052-3/+3
| | | |
| * | | CHanged to Helper MethodTim Zallmann2017-10-051-1/+1
| | | |
View Lorry Controller Status