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
AgeCommit message (Collapse)Author
2015-10-10Merge branch 'rs-update-whenever' into 'master' Dmitriy Zaporozhets
Remove whenever gem Closes #2879 See merge request !1538
2015-10-10Update monthly release post templateRobert Speicher
[ci skip]
2015-10-09Merge branch 'update-changelog-for-emoji-fix' into 'master' Stan Hu
Update CHANGELOG for Emoji fix in a3c6ed5c4 [ci skip] See merge request !1556
2015-10-09Update CHANGELOG for Emoji fix in a3c6ed5c4Stan Hu
[ci skip]
2015-10-09Merge branch 'fix-issue-filter-dropdown-labels' into 'master' Dmitriy Zaporozhets
Restore placeholders in issue filters from "Any" to "Milestone" and "Label" 1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders. ### Before ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2326b836e364275341ea0ad8c0a0926b/image.png) ### After ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b0e519f9cf8d1a3c0f054286e3b809cb/image.png) See merge request !1554
2015-10-09Merge branch 'rs-issue-2970' into 'master' Douwe Maan
Normalize space-like characters in keys before output to gitlab-shell gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970 See merge request !1552
2015-10-09Merge branch 'rs-mr-tab-loader' into 'master' Douwe Maan
Make the loading spinner toggle more explicit Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! :boom: See merge request !1553
2015-10-09Merge branch 'clarify_support' into 'master' Sytse Sijbrandij
Clarify support request message Since we have the (GitLab.com) Support Forum, this message may be slightly confusing. Hopefully this wording improves understanding. If anyone has suggestions on making this clearer I'm open. See merge request !1406
2015-10-09Merge branch 'rs-2fa-task' into 'master' Jacob Vosmaer
Add task to disable 2FA for all users Addresses #2971 See merge request !1532
2015-10-09Merge branch 'improve_empty_fork' into 'master' Dmitriy Zaporozhets
Show message if user tries to fork and has no available namespaces This merge request improves the UX when users try to fork a project and have no eligible namespaces. ### Current behavior ![Screen_Shot_2015-09-25_at_1.39.45_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/45a303703a0197e78f7f9bdbea8718b5/Screen_Shot_2015-09-25_at_1.39.45_PM.png) ### Proposed behavior ![Screen_Shot_2015-09-25_at_1.38.57_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/613c53bcfb52d79fdf8bd1d09410c152/Screen_Shot_2015-09-25_at_1.38.57_PM.png) ### Things to check I'm not exactly loving the wording I have here. I'm open to improvements. See merge request !1441
2015-10-09Merge branch 'fix-header-hamburger-positioning' into 'master' Dmitriy Zaporozhets
Fixed positioning of hamburger menu on header Hey guys just noticed the hamburger menu for the top navigation was mis-aligned on `gitlab-ce:master` and `gitlab.com`. I was not able to find an open issue or merge request directly referencing this issue so thought I would add a quick fix. ### Changes This MR changes the vertical positioning from `top` to vertical margins (Like in bootstrap itself). - Also added a minor fix to remove `border-top` from the collapse menu so its the same height as the navigation. - finally added an active class to the hamburger toggle so you can see when its open. This changes an element in `app/views/layouts/header/_default.html.haml` and thus would impact most pages behind login. ## Screenshots ### Before ![before](https://gitlab.com/hanloong/gitlab-ce/uploads/e3d4631dd0420ec0e9048c435a2f734b/before.png) ### After ![after](https://gitlab.com/hanloong/gitlab-ce/uploads/7c93c3ef1b01fbefc39c5a1ed61c2d1b/after.png) Happy to discuss any changes/suggestions. Thanks See merge request !1541
2015-10-09Restore placeholders in issue filters from "Any" to "Milestone" and "Label"Stan Hu
1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders.
2015-10-09Add output and confirmation to gitlab:two_factor:disable_for_all_usersRobert Speicher
2015-10-09fixed positioning of hamburger menu on headerHan Loong Liauw
- Changed to margin for vertical allign as used in bootstrap 3 original - Also added an `active` state to show when the extra items are enabled
2015-10-09Make the loading spinner toggle more explicitRobert Speicher
Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! :boom:
2015-10-09Normalize space-like characters in keys before output to gitlab-shellRobert Speicher
gitlab-shell expects only one tab separator per key, and an SSH key with a tab character in the comment, for example, would break things. Closes #2970
2015-10-09Just kidding, we're deleting whenever entirelyRobert Speicher
2015-10-08Clarify support request messageDrew Blessing
2015-10-08Show message if user tries to fork and has no available namespacesDrew Blessing
2015-10-08Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu
2015-10-08Merge pull request #9693 from bbodenmiller/patch-1Stan Hu
allow crawling of commit page but not patch/diffs
2015-10-08Merge branch 'workaround-seed-fu-issue' into 'master' Douwe Maan
Fixes GDK issue where repos would not be imported properly Seed-Fu runs this entire fixture in a transaction, so the `after_commit` hook won't run until after the fixture is loaded. That is too late since the Sidekiq::Testing block has already exited. Force clearing the `after_commit` queue to ensure the job is run now. See: gitlab-org/gitlab-development-kit#58 See merge request !1513
2015-10-08Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets
2015-10-08Merge remote-tracking branch 'public/project-find-with-namespace-performance'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-08Merge branch 'update-upgrade-guide-for-redis-2.4.0' into 'master' Stan Hu
Update upgrade guide for Redis >= 2.4.0 requirement [ci skip] Closes #2837 See merge request !1468
2015-10-08Merge remote-tracking branch 'public/trending-projects-performance'Dmitriy Zaporozhets
2015-10-08Merge branch 'implement-new-gitlab-colors' into 'master' Dmitriy Zaporozhets
Add new GitLab colors After this merge request all css must use variables for colours. ![7Od6vP7usJ__1_](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01dd327770f25c76448a5860a76e34c9/7Od6vP7usJ__1_.png) cc @skyruler See merge request !1542
2015-10-08Added changelog for project namespace performanceYorick Peterse
2015-10-08Added dedicated Rake task for setting up PostgresYorick Peterse
This ensures any PostgreSQL specific schema changes (e.g. expression indexes) are created when setting up the database.
2015-10-08Revamp finding projects by namespacesYorick Peterse
By using a JOIN we can remove the need for using 2 separate queries to find a project by its namespace. Combined with an index (only needed for PostgreSQL) this reduces the query time from ~245 ms (~520 ms for the first call) down to roughly 10 ms (~15 ms for the first call).
2015-10-08Improve help/ui pageDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-08Add new GitLab colorsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-08Merge branch 'XenGi/gitlab-ce-master'Stan Hu
2015-10-08Merge branch 'rs-update-slack-notifier' into 'master' Dmitriy Zaporozhets
Update slack-notifier to ~> 1.2.0 Closes #2826 See merge request !1533
2015-10-08Merge branch 'rs-update-tinder' into 'master' Dmitriy Zaporozhets
Update tinder to ~> 1.10.0 Closes #2823 See merge request !1534
2015-10-08Merge branch 'rs-update-rack-cors' into 'master' Dmitriy Zaporozhets
Update rack-cors to ~> 0.4.0 Closes #2800 See merge request !1536
2015-10-08Merge branch 'rs-update-haml-rails' into 'master' Dmitriy Zaporozhets
Update haml-rails to ~> 0.9.0 Closes #2804 See merge request !1535
2015-10-08Merge branch 'fix-build-highlight' into 'master' Dmitriy Zaporozhets
Fix build highlight Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan See merge request !1539
2015-10-08Merge branch 'rs-quick-submit' into 'master' Douwe Maan
Add "Quick Submit" JS behavior This takes the "Command+Enter" (or "Ctrl+Enter") quick-post behavior from the discussion field and expands it to fields throughout the application, most notably the issuable forms (e.g., New Issue, Edit Merge Request). See merge request !1516
2015-10-08Fix build highlightDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-08Update whenever to ~> 0.9.4Robert Speicher
2015-10-08Use `methods: :any` in our rack-cors configurationRobert Speicher
This was added in rack-cors 0.4.0 and allows all types of CORS requests to the API.
2015-10-08Update rack-cors to ~> 0.4.0Robert Speicher
2015-10-08Update haml-rails to ~> 0.9.0Robert Speicher
2015-10-08Update tinder to ~> 1.10.0Robert Speicher
2015-10-08Update slack-notifier to ~> 1.2.0Robert Speicher
2015-10-08Check originalEvent.repeat *and* event.repeatRobert Speicher
phantomjs < 2.0 doesn't support creating `KeyboardEvent` so the tests were failing on CI
2015-10-08Added concern for case-insensitive WHERE queriesYorick Peterse
On PostgreSQL these queries use LOWER(...) to compare columns and values. For MySQL a regular WHERE is performed as MySQL is already case-insensitive.
2015-10-08Added methods for detecting MySQL/PostgreSQLYorick Peterse
These two methods remove the need for manually going into ActiveRecord::Base.connection all over the place.
2015-10-07Merge branch 'clarify-postfix' into 'master' Robert Speicher
Clarify Reply by email settings when using Postfix mail server Fixes #2902. [ci skip] See merge request !1528