summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* enable SSL by defaultenable_ssl_by_defaultValery Sizov2015-09-171-1/+1
|
* Merge branch 'fix-ci-nav' into 'master'Dmitriy Zaporozhets2015-09-165-10/+4
|\ | | | | | | | | | | | | | | | | 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
| * Fix confusing behaviour of back link in CI sidebarDmitriy Zaporozhets2015-09-165-10/+4
| | | | | | | | | | Back link should always be responsible for sidebar navigation below. It should change sidebar navigation to one level up
* | Merge branch 'style-ci-page' into 'master'Dmitriy Zaporozhets2015-09-164-21/+56
|\ \ | | | | | | | | | | | | | | | | | | | | | Style CI projects page and builds list Partly implements #2545 See merge request !1315
| * | Style CI projects page and builds listDmitriy Zaporozhets2015-09-164-21/+56
| |/
* | Merge branch 'fix-issue-2555' into 'master'Dmitriy Zaporozhets2015-09-163-3/+3
|\ \ | |/ |/| | | | | | | | | | | Fix default avatars to ensure that helpers don't have /assets dir appended See issue #2555 See merge request !1314
| * Eliminate combined image_tag and image_path in providers listStan Hu2015-09-161-1/+1
| |
| * Fix default avatars to ensure that helpers don't have /assets dir appendedStan Hu2015-09-162-2/+2
| |
* | Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets2015-09-163-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Add links from GitLab to CIDmitriy Zaporozhets2015-09-163-0/+10
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Fix CI testsKamil Trzcinski2015-09-161-1/+1
| |
* | Fix ordering issueKamil Trzcinski2015-09-161-1/+1
| |
* | Fix projects editKamil Trzcinski2015-09-161-1/+1
|/
* Merge remote-tracking branch 'origin/master' into ↵ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-0/+1
|\ | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * Merge pull request #9634 from allistera/users-autocomplete-sort-orderStan Hu2015-09-151-0/+1
| |\ | | | | | | Sorted autocomplete users list by name
| | * Sorted autocomplete users list by nameAllister Antosik2015-09-151-0/+1
| | |
* | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-159-65/+72
|\ \ \ | |/ / | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
| * | Merge branch 'fix-upload-ui' into 'master'Stan Hu2015-09-159-65/+72
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-156-52/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Improve wording for header and placeholdersRobert Schilling2015-09-153-7/+7
| | | |
| | * | Cleanup some html/css for upload featureDmitriy Zaporozhets2015-09-156-18/+27
| | |/ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2015-09-1586-342/+671
|\ \ \ | |/ / | | | | | | | | | | | | | | | ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g # Conflicts: # Gemfile.lock
| * | Merge branch 'slack-help-text' into 'master'Drew Blessing2015-09-151-0/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | 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
| | * Add a help text to the Slack ServiceJeroen van Baarsen2015-09-151-0/+6
| | | | | | | | | | | | | | | | | | | | | 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>
| * | Use fixed version of fogbugz gemJared Szechy2015-09-151-5/+3
| |/ | | | | | | This allows us to properly handle authentication errors.
| * Merge branch 'fix_empty_project' into 'master'Dmitriy Zaporozhets2015-09-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Fix empty project UIDrew Blessing2015-09-141-1/+1
| | |
| * | Merge branch 'import-in-progress-fix' into 'master'Dmitriy Zaporozhets2015-09-151-2/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Display "Forking in Progress" when importing a forked projectStan Hu2015-09-151-2/+5
| | | |
| | * | Don't display "git clone --bare <URL>" if no URL is availableStan Hu2015-09-151-1/+2
| | | | | | | | | | | | | | | | Introduced in !1231
| * | | Merge branch 'ui-fixes' into 'master'Dmitriy Zaporozhets2015-09-156-27/+49
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | Improve UI for last push widget and web editor See merge request !1296
| | * | Fix UI for web editorDmitriy Zaporozhets2015-09-153-4/+20
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | Fix last push widgetDmitriy Zaporozhets2015-09-153-23/+29
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-09-159-9/+158
| |\ \ \ | | |/ / | |/| |
| | * | Merge pull request #9138 from liyakun/masterStan Hu2015-09-149-9/+158
| | |\ \ | | | | | | | | | | add "replace" and "upload" functionality
| | | * | Add "Replace" and "Upload" featuresliyakun2015-09-159-10/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Improve project settings button on profileDmitriy Zaporozhets2015-09-151-2/+2
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add current_ref helper methodheader-titlesDmitriy Zaporozhets2015-09-144-7/+9
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Remove repeating titles on members and label pagesDmitriy Zaporozhets2015-09-143-30/+29
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add page titles to header for group and projectDmitriy Zaporozhets2015-09-146-20/+67
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-146-46/+54
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Hide search panel for group page if you dont have accesspublic_profilesDmitriy Zaporozhets2015-09-142-2/+6
| | | | |
| | * | | Fix tests and improve wordingDmitriy Zaporozhets2015-09-141-2/+1
| | | | |
| | * | | Hide group sidebar menu if user cant access itDmitriy Zaporozhets2015-09-141-29/+30
| | | | |
| | * | | Show activity/projects depends on accessDmitriy Zaporozhets2015-09-141-14/+18
| | | | |
| | * | | Allow access to group from root urlDmitriy Zaporozhets2015-09-141-1/+1
| | | | |
| | * | | Skip auth for group page but return auth for other group pagesDmitriy Zaporozhets2015-09-144-3/+7
| | | | |
| | * | | Make all group publicValery Sizov2015-09-093-12/+8
| | | | |
| * | | | Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets2015-09-144-17/+57
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | Import forked repositories asynchronously to prevent large repositories from ↵Stan Hu2015-09-114-17/+57
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
View Lorry Controller Status