summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-158-60/+58
| | | | | | | | | | | | | | 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 pull request #9632 from szechyjs/update-fogbugz-gemStan Hu2015-09-153-9/+7
|\ | | | | Use fixed version of fogbugz gem
| * Use fixed version of fogbugz gemJared Szechy2015-09-153-9/+7
|/ | | | This allows us to properly handle authentication errors.
* Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Speicher2015-09-151-1/+1
|\
| * Merge pull request #9630 from fscherwi/patch-1Robert Schilling2015-09-151-1/+1
| |\ | | | | | | change coverage image to svg [ci skip]
| | * change coverage image to svg [ci skip]fscherwi2015-09-151-1/+1
| |/
* | Merge branch 'rs-update-guide' into 'master'Robert Speicher2015-09-151-4/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder the `--without` arugments so the database comes first Hopefully this will make it a bit clearer that we're excluding a certain database type. [ci skip] See merge request !1301
| * | Reorder the `--without` arugments so the database comes firstRobert Speicher2015-09-151-4/+4
|/ / | | | | | | | | | | | | Hopefully this will make it a bit clearer that we're excluding a certain database type. [ci skip]
* | Merge branch 'rs-update-guide' into 'master'Robert Speicher2015-09-151-27/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | Minor editing of the 7.14-to-8.0 update guide [ci skip] See merge request !1300
| * | Minor editing of the 7.14-to-8.0 update guideRobert Speicher2015-09-151-27/+41
|/ /
* | 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 'update-gitlab-emoji' into 'master'Marin Jankovski2015-09-151-5/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | Update gitlab_emoji to 0.1.1 See merge request !1290
| * | | Update gitlab_emoji to 0.1.1Robert Schilling2015-09-141-5/+2
| | | |
* | | | 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-1513-11/+273
|\ \ \ \
| * \ \ \ Merge pull request #9138 from liyakun/masterStan Hu2015-09-1413-11/+273
| |\ \ \ \ | | | | | | | | | | | | add "replace" and "upload" functionality
| | * | | | Add "Replace" and "Upload" featuresliyakun2015-09-1513-12/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge branch 'renasem-btn' into 'master' Dmitriy Zaporozhets2015-09-151-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Improve project settings button on profile Rename `Edit profile settings` to `profile settings` button Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1932
| * | | | Improve project settings button on profileDmitriy Zaporozhets2015-09-151-2/+2
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'header-titles' into 'master'Dmitriy Zaporozhets2015-09-1411-55/+103
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add page titles to header for group and project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2586 See merge request !1293
| * | | 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-1413-78/+93
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-4/+3
| | | |
| * | | Hide group sidebar menu if user cant access itDmitriy Zaporozhets2015-09-141-29/+30
| | | |
| * | | Fix tests for group accessDmitriy Zaporozhets2015-09-141-6/+6
| | | |
| * | | 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-0910-48/+51
| | | |
* | | | Merge branch 'forked-repo-creation-async' into 'master'Dmitriy Zaporozhets2015-09-149-21/+101
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-119-21/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timing out Use import_status to track async import status and give feedback to the user Closes #2388 Closes #2400
* | | | Merge branch 'fix_tooltips' into 'master'Dmitriy Zaporozhets2015-09-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix tooltip display in list views After the recent UI changes the tooltips in a list view rendered behind the next object. This resets the tooltip's container to the body, rather than the individual `issue-info` div. In particular, this change will be applied to *all* tooltips in GitLab. This should take care of any other unidentified issues like this and should not have any negative effects that I can think of. This fixes the bug I noted in !1255. **Current:** ![Screen_Shot_2015-09-14_at_8.45.34_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/5fc6343f2e440dd10d01dfa595835e6a/Screen_Shot_2015-09-14_at_8.45.34_AM.png) **As proposed:** ![Screen_Shot_2015-09-14_at_8.44.35_AM](https://gitlab.com/dblessing/gitlab-ce/uploads/7ffce7ce7523514bf7bb43d6380eb1d1/Screen_Shot_2015-09-14_at_8.44.35_AM.png) See merge request !1288
| * | | | Fix tooltip display in list viewsDrew Blessing2015-09-141-1/+1
|/ / / /
* | | | Merge branch 'add_diff_note_hover_size' into 'master'Dmitriy Zaporozhets2015-09-141-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep add-diff-note button the same size on hover. Fixes #2497 Removes the overridden `font-size` and `width` so the button inherits size on hover. See #2497 for screenshots of prior behavior. See merge request !1285
| * | | | Keep add-diff-note button the same size on hover. Fixes #2497Drew Blessing2015-09-121-2/+0
| | | | |
* | | | | Merge branch 'latest_tag_patch_release' into 'master'Hannes Rosenögger2015-09-141-5/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add LATEST_TAG variable to automatically fetch the latest tag Add LATEST_TAG variable to automatically fetch the latest tag Replaces !1241 See merge request !1287
| * | | | | Add LATEST_TAG variableAchilleas Pipinellis2015-09-141-5/+4
| | | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-09-141-1/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'issues-database' into 'master' Job van der Voort2015-09-141-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added note about Issues stored in the database Because of tweet https://twitter.com/galstar/status/637981324117020672 See merge request !1930
View Lorry Controller Status