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/app
AgeCommit message (Collapse)Author
2015-09-17Merge branch 'remove-ci-help' into 'master'Kamil Trzciński
Remove CI help Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2556 See merge request !1325
2015-09-17Remove CI helpKamil Trzcinski
2015-09-17Move partial locals out of controllerStan Hu
2015-09-17Merge pull request #9618 from pjknkda/repo-info-to-issue-hookStan Hu
add repository field to issue hook data
2015-09-17Fix nav_link for dashboardKamil Trzcinski
2015-09-17Remove duplicate codeKamil Trzcinski
2015-09-17Check current_controller against controller_pathKamil Trzcinski
The controller_path includes namespaces, where controller_name only includes the class name without controller
2015-09-17Integrate CI navigation more tightly with projectKamil Trzcinski
2015-09-17Merge branch 'fix-issue-2382' into 'master'Stan Hu
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c89cc8a0a9fa549deac433f17b890913/image.png) Closes #2382 See merge request !1227
2015-09-17Merge branch 'enable_ssl_by_default' into 'master'Valery Sizov
Enable SSL by default https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1135 See merge request !1299
2015-09-17Merge branch 'fix-ci-500-on-settings' into 'master'Dmitriy Zaporozhets
Fix 500 on CI project settings Fix: https://gitlab.com/gitlab-org/gitlab-ce/issues/2546 /cc @dzaporozhets See merge request !1321
2015-09-17Merge branch 'fix-public-projects' into 'master'Dmitriy Zaporozhets
Fix displaying public projects Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/2552 See merge request !1318
2015-09-17enable SSL by defaultValery Sizov
2015-09-17Fix HTML link that was improperly escaped in new user e-mailStan Hu
Closes https://github.com/gitlabhq/gitlabhq/issues/9640
2015-09-16add repository field to issue hook dataJungkook Park
add a test for to_hook_data of issue model update CHANGELOG
2015-09-16Fix 500 on CI project settingsKamil Trzcinski
2015-09-16Fix displaying public projectsKamil Trzcinski
2015-09-16Merge branch 'fix-ci-nav' into 'master'Dmitriy Zaporozhets
Fix confusing behaviour of back link in CI sidebar Back link should always be responsible for sidebar navigation below. It should change sidebar navigation to one level up See merge request !1316
2015-09-16Merge branch 'style-ci-page' into 'master'Dmitriy Zaporozhets
Style CI projects page and builds list Partly implements #2545 See merge request !1315
2015-09-16Merge branch 'fix-issue-2555' into 'master'Dmitriy Zaporozhets
Fix default avatars to ensure that helpers don't have /assets dir appended See issue #2555 See merge request !1314
2015-09-16Fix confusing behaviour of back link in CI sidebarDmitriy Zaporozhets
Back link should always be responsible for sidebar navigation below. It should change sidebar navigation to one level up
2015-09-16Eliminate combined image_tag and image_path in providers listStan Hu
2015-09-16Style CI projects page and builds listDmitriy Zaporozhets
2015-09-16Fix default avatars to ensure that helpers don't have /assets dir appendedStan Hu
2015-09-16Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets
Add links from GitLab to CI * link from dashboard to CI dashboard * link from project to CI project Its a fast solution for 8.0. Might be improved in later versions Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1313
2015-09-16Add links from GitLab to CIDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-16Fix CI testsKamil Trzcinski
2015-09-16Fix ordering issueKamil Trzcinski
2015-09-16Fix projects editKamil Trzcinski
2015-09-16Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-16Merge pull request #9634 from allistera/users-autocomplete-sort-orderStan Hu
Sorted autocomplete users list by name
2015-09-16Sorted autocomplete users list by nameAllister Antosik
2015-09-16Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski
ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-15Merge branch 'fix-upload-ui' into 'master'Stan Hu
Cleanup some html/css for upload feature * fix colors to match UI style * cleanup templates from meaningless code * improve placeholders * remove code duplication in template * improve error handling: remove file automatically Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> For #2520 See merge request !1297
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 branch 'slack-help-text' into 'master'Drew Blessing
Add a help text to the Slack Service When setting up the service I was not sure which webhook I should use, by adding this Help text I hope we can help people in the future with setting up this hook See merge request !1302
2015-09-15Fix: features/ci/admin/runners_spec.rbKamil Trzcinski
2015-09-15Change the replace placeholder to use the filenameStan Hu
Dynamically adjust placedholder for uploads and fix Dropzone event handlers Override error handler to prevent error messages from being inserted underneath image preview Fix tests Use regexp instead of startsWith for better browser compatibility Remove duplicate code in _replace.html.haml and use one template Remove files upon error and retain alert messages until user adds a new file
2015-09-15Improve wording for header and placeholdersRobert Schilling
2015-09-15Cleanup some html/css for upload featureDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-15Use fixed version of fogbugz gemJared Szechy
This allows us to properly handle authentication errors.
2015-09-15Fix: features/ci/runners_spec.rbKamil Trzcinski
2015-09-15Add a help text to the Slack ServiceJeroen van Baarsen
When setting up the service I was not sure which webhook I should use, by adding this Help text I hope we can help people in the future with setting up this hook Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-09-15Merge branch 'fix_empty_project' into 'master'Dmitriy Zaporozhets
Fix empty project UI In an empty project, the 'project is empty' light well was mashed up against the project panel. The light well have 16px margin so there was some white space along the edges that looked funny. This MR makes the 'project is empty' text block a `gray-content-area` which fits nicely with the rest of the UI. **Current:** ![Screen_Shot_2015-09-14_at_11.20.47_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/07b39641f602e01440dd5558a0d80237/Screen_Shot_2015-09-14_at_11.20.47_AM.png) **As proposed:** ![Screen_Shot_2015-09-14_at_11.20.29_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/1c3b1d73584c68a88cd1b0fcf3d6ea5b/Screen_Shot_2015-09-14_at_11.20.29_AM.png) See merge request !1291
2015-09-15Merge branch 'import-in-progress-fix' into 'master'Dmitriy Zaporozhets
Don't display "git clone --bare <URL>" if no URL is available Make it clear that forking is different than importing. Forked repositories don't use `import_url`, so only display if is available. Introduced in !1231 Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d8456334a2a9187b56a885f8849f229e/image.png) After: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9823e8a2baf02859c4c3f05f3a5c35bf/image.png) See merge request !1295
2015-09-15fix specs. Stage 7Valery Sizov
2015-09-15Display "Forking in Progress" when importing a forked projectStan Hu
2015-09-15Don't display "git clone --bare <URL>" if no URL is availableStan Hu
Introduced in !1231
2015-09-15Create a "destroyed Milestone" event and keep Milestone events around in the DBStan Hu
for posterity. Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone". Add "in" preposition when creating and destroying milestones Closes #2382
2015-09-15fix specs. Stage 5Valery Sizov