Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/config
AgeCommit message (Collapse)Author
2015-09-28Move CI variables page to project settingsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-28Merge branch 'move-runners-page'Dmitriy Zaporozhets
2015-09-28Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan
2015-09-25Move runners page to project settingsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24Move login button to user page, switched to POST methodPavel Forkert
2015-09-24Add and document option to use StartTLS with mail_room.Douwe Maan
2015-09-24Add option to admin area to sign in as a specific userPavel Forkert
Closes #2291
2015-09-23Move CI charts to project graphs areaDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-21Merge branch 'rename-reply-by-email' into 'master' Robert Speicher
Rename reply_by_email to incoming_email to prepare for the future. Closes #2579. See merge request !1367
2015-09-21Fix grammarSytse Sijbrandij
2015-09-21Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan
2015-09-20fixes link to reply_by_email docsSameer Naik
2015-09-18remove API calls from CE to CIValery Sizov
2015-09-18Merge branch 'pg_dump_schema' into 'master' Dmitriy Zaporozhets
Add pg_schema to backup config https://dev.gitlab.org/gitlab/gitlabhq/issues/2489 See merge request !1345
2015-09-18add pg_schema to backup configValery Sizov
2015-09-18Allow to disable GitLab CIKamil Trzcinski
2015-09-17Remove CI helpKamil Trzcinski
2015-09-16Merge branch 'ldap-attributes' into 'master'Robert Speicher
Allow configuration of LDAP attributes GitLab will use for the new user account. Fixes #2412. See merge request !1261
2015-09-16Update documentation and config filesKamil Trzcinski
2015-09-15Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
2015-09-15Merge pull request #9138 from liyakun/masterStan Hu
add "replace" and "upload" functionality
2015-09-15 Add "Replace" and "Upload" featuresliyakun
Refactor upload and replace functionality Rename file and move CSS Fix typo Make dropzone a div Remove unnecessary file Change color of "upload existing one" Add missing changes
2015-09-14Revert "monkey patch of Hash"Kamil Trzcinski
This reverts commit 6014019ed49295178ebd0c4ce5f6f1d210219420.
2015-09-14monkey patch of HashValery Sizov
2015-09-14Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of ↵Valery Sizov
gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-14fix of APIValery Sizov
2015-09-11Merge branch 'dashboard-titles' into 'master'Dmitriy Zaporozhets
Clean up overlap between dashboard and explore - Clean up overlap between dashboard and explore. ... 5d785457 - Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not. - Consistently case `Back to X` links. 260fcd45 - Link to help from signin page bottom. d92696d3 - Make Help accessible for guests. c258e977 cc @dzaporozhets See merge request !1260
2015-09-11Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-10Bump rouge to 1.10.1Stan Hu
2015-09-10Merge branch 'master' into dashboard-titlesDouwe Maan
2015-09-10remove gitlab_ci configValery Sizov
2015-09-09Merge branch 'rouge-patch' into 'master'Robert Speicher
Fix highlighting of deleted lines in diffs. Resolves internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2498 Only needed until https://github.com/jneen/rouge/pull/297 is merged into Rouge and the gem is updated in GitLab. Forking `rouge`, releasing `gitlab-rouge` and using that gem wasn't an option, since `gollum-lib` has `rouge` as a dependency, so it would get included anyway, and which code we'd get would depend on the load order. See merge request !1267
2015-09-09Fix reading session_expire_delay when application settings are not yet ↵Kamil Trzcinski
created and migrations are not yet done
2015-09-09Fix highlighting of deleted lines in diffs.Douwe Maan
2015-09-09Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gDmitriy Zaporozhets
2015-09-09Add to docsDouwe Maan
2015-09-09Expand explanation in config fileDouwe Maan
2015-09-09Merge branch 'global_labels' into 'master'Dmitriy Zaporozhets
Global labels https://dev.gitlab.org/gitlab/gitlabhq/issues/2353 See merge request !1240
2015-09-09FogBugz project importJared Szechy
2015-09-08Add attributes to LDAP::Config.Douwe Maan
2015-09-08Allow configuration of LDAP attributes GitLab will use for the new user account.Douwe Maan
2015-09-08Clean up overlap between dashboard and explore.Douwe Maan
- Split up SnippetsController into separate dashboard and explore sections. - Use consistent page titles, header titles and sidebars between dashboard and explore sections when signed in or not.
2015-09-07Merge branch 'crowd' into 'master'Valery Sizov
Crowd integration https://dev.gitlab.org/gitlab/gitlabhq/issues/2217 See merge request !1228
2015-09-07Merge branch 'fix-wiki-page-history' into 'master'Douwe Maan
Fix broken Wiki Page History This MR fixes the broken Page History on the Wiki pages. It turns out `WikiHelper` did not allow users to view different versions due to its omitting of query string parameters, which was necessary to specify different `version_id` parameters. Instead of this hacky approach, use manually-specified wildcard routes that match the ID field properly for slashes. Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399 See merge request !1232
2015-09-03CRUD for admin labelsValery Sizov
2015-09-02Avoid instance variable re-use troubleJacob Vosmaer
This is the quickest/dumbest/safest way I could think of to prevent the instance variable reuse problems we have on dev.gitlab.org now.
2015-09-02Crowd integrationValery Sizov
2015-09-02Fix broken Wiki Page HistoryStan Hu
Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-09-01Merge branch 'gitlab-git-http-server' into 'master'Dmitriy Zaporozhets
Replace grack with gitlab-git-http-server See merge request !1229
2015-08-31Replace grack with gitlab-git-http-serverJacob Vosmaer