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-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-14Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets
Make all group public https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1219# Internal issue - https://dev.gitlab.org/gitlab/gitlabhq/issues/1361 See merge request !1247
2015-09-14Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets
Import forked repositories asynchronously to prevent large repositories from timing out Preserve synchronous mode of adding a repository since some tasks (e.g. restore/check) require the former. One side bug fix is that the `ProjectCacheWorker` is also run, updating the repository size and commit numbers properly. Previously all the values were set to 0 when a project were forked. * Closes #2388 * Closes #2400 See merge request !1231
2015-09-11Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu
timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
2015-09-10Merge branch 'master' into dashboard-titlesDouwe Maan
2015-09-10Fix testStan Hu
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-09Fix snippets exploration testDouwe Maan
2015-09-09Fix specDouwe Maan
2015-09-09Make all group publicValery Sizov
2015-09-08Use new routing helperDouwe 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-08Consistently case `Back to X` links.Douwe Maan
2015-09-07Merge branch 'ui-improvements' into 'master'Dmitriy Zaporozhets
Ui improvements * fix project home page when activity set as default * style commits, branches and tags pages to new style * render flash message outside of content block * style group pages See merge request !1255
2015-09-07Fix compare testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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-07Fix testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-07satisfy rubocopValery Sizov
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-04Fix this crazy random failing testDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-04Fix failing testDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03Fix testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03Fix testsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-03added spinach for glabal labelsValery Sizov
2015-09-02Fix tests and update CHANGELOGDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-02added spinachValery Sizov
2015-09-02Fix broken Wiki Page HistoryStan Hu
Closes #2104 Closes #1751 Closes #1592 Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-08-27Make all profile publicValery Sizov
2015-08-26Merge branch 'enable_ssl_verification_web_hook' into 'master'Dmitriy Zaporozhets
Enable SSL verification for Webhooks https://dev.gitlab.org/gitlab/gitlabhq/issues/2121 See merge request !1135
2015-08-26Enable SSL verification for WebhooksValery Sizov
2015-08-25Merge branch 'separate-activity' into 'master'Dmitriy Zaporozhets
Separate activity page Move activity to separate page. Part of #2225 ![Screenshot_2015-08-25_15.07.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2126b22ed7b98a2f748c96ad60bc8b2e/Screenshot_2015-08-25_15.07.23.png) See merge request !1198
2015-08-25Fix tests and last push widgetDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-25Merge branch 'fix-reload-with-full-diff-in-compare-branch' into 'master'Dmitriy Zaporozhets
Fix "Reload with full diff" URL button in compare branch view This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view. See merge request !1195
2015-08-25Fix "Reload with full diff" URL button in compare branch viewStan Hu
This button worked when viewing merge requests because the JavaScript stripped the .html in the Ajax request. However, it left the .html suffix in the compare branch view.
2015-08-24Ability to search milestonesValery Sizov
2015-08-22Merge branch 'fix-email-autocomplete' into 'master'Douwe Maan
Fix bug preventing invite by e-mail This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320 See merge request !1181
2015-08-21Fix bug preventing invite by e-mailStan Hu
This was broken in 70f5291808 as a result of introducing the ability to filter by current user. Closes #2320
2015-08-20Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-08-20Fix testDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-20Import sources: show only enabled sourcesArtem Sidorenko
2015-08-19Spinach testsArtem Sidorenko
2015-08-19Merge branch 'remove-satellites'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-18capitalize URL in "Home page URL"Ben Bodenmiller
2015-08-14Fix tests for web editorDmitriy Zaporozhets
2015-08-11Merge branch 'master' into remove-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-11Merge branch 'check-out-branch-button' into 'master' Dmitriy Zaporozhets
Add "Check out branch" button to the MR page. I appreciated the thought behind adding the "Fetch this branch using ..." line, but not so much the implementation. I think a "Check out branch" button alongside the existing "Download as" makes more sense to get instructions on how to get the changes on your local machine, since that's pretty much what "Download as" does as well. Like the "command line", the button opens the command line merge instructions modal. I've improved the text of that modal in !1120. ![Screen_Shot_2015-08-08_at_22.10.19](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fd185df012e9759dfea198ed9fa3f80f/Screen_Shot_2015-08-08_at_22.10.19.png) It looks even better in combination with !1121, which gets rid of the "If you want to ..." line: ![Screen_Shot_2015-08-08_at_22.10.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3fa469d0e2bd4e3ec4992ffa5864c718/Screen_Shot_2015-08-08_at_22.10.55.png) cc @dzaporozhets @rspeicher See merge request !1116
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-10Merge branch 'master' into check-out-branch-buttonDouwe Maan