summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Merge pull request #8662 from yglukhov/mr-and-issue-linksDmitriy Zaporozhets2015-03-192-2/+2
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Make MR and issue numbers clickable links in MR and issue lists.
| | * | | | | | Make MR and issue numbers clickable links in MR and issue lists.yglukhov2015-02-152-2/+2
| | | | | | | |
* | | | | | | | Merge branch 'import-button' into 'master'Dmitriy Zaporozhets2015-03-192-51/+53
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move "Import existing repository by URL" option to button. The "Import existing repository URL" (with or without form visible) looked out place with the new import buttons. I moved it to a button, and moved the form to below the buttons. @dzaporozhets Would be nice to have in 7.9 since the moved buttons are in there as well. Before: ![Screen_Shot_2015-03-19_at_15.08.04](https://dev.gitlab.org/gitlab/gitlabhq/uploads/6ac26467ede65a4f31d004c227fdbc3e/Screen_Shot_2015-03-19_at_15.08.04.png) After: ![Screen_Shot_2015-03-19_at_15.42.56](https://dev.gitlab.org/gitlab/gitlabhq/uploads/a73bd7d09b7a33f58067a3bd0d7f604a/Screen_Shot_2015-03-19_at_15.42.56.png) ("publically" typo has been fixed to "publicly") See merge request !1728
| * | | | | | | Clear up import help.Douwe Maan2015-03-191-6/+9
| | | | | | | |
| * | | | | | | Move "Import existing repository by URL" option to button.Douwe Maan2015-03-192-46/+45
| | | | | | | |
* | | | | | | | Merge branch 'add_canceled_ci_status' into 'master'Dmitriy Zaporozhets2015-03-194-1/+14
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add canceled CI status Fixes https://github.com/gitlabhq/gitlab-ci/issues/564 https://dev.gitlab.org/gitlab/gitlab-ci/issues/169 ![Screen_Shot_2015-03-19_at_17.10.08](https://dev.gitlab.org/gitlab/gitlabhq/uploads/87f47d9fd1b1a60e0c5402eedd1a1566/Screen_Shot_2015-03-19_at_17.10.08.png) See merge request !1729
| * | | | | | | | add canceled CI statusValery Sizov2015-03-194-1/+14
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Use same font for project description and star linksDmitriy Zaporozhets2015-03-191-2/+6
| | | | | | | |
* | | | | | | | Merge branch 'fix/navbar-toggle-margin' into 'master'Dmitriy Zaporozhets2015-03-192-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix(style): align navbar-toggle Changes: - change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;` ## Before: - 320x480 ![Screen_Shot_2015-03-19_at_03.43.53](https://gitlab.com/kingcody/gitlab-ce/uploads/376727af07cf62eec5609c01bbbdaacf/Screen_Shot_2015-03-19_at_03.43.53.png) - 360x640 ![Screen_Shot_2015-03-19_at_03.44.04](https://gitlab.com/kingcody/gitlab-ce/uploads/d5318de4f45687154d90c54f0bece2aa/Screen_Shot_2015-03-19_at_03.44.04.png) ## After: - 320x480 ![Screen_Shot_2015-03-19_at_03.45.21](https://gitlab.com/kingcody/gitlab-ce/uploads/20f526c9ef19c2c30add001b15c06358/Screen_Shot_2015-03-19_at_03.45.21.png) - 360x640 ![Screen_Shot_2015-03-19_at_03.45.27](https://gitlab.com/kingcody/gitlab-ce/uploads/e60e9dde1f86d89adf36480e7fcc611d/Screen_Shot_2015-03-19_at_03.45.27.png) See merge request !402
| * | | | | | | | fix(style): align navbar-togglekingcody2015-03-192-1/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - change `.navbar-toggle` from `margin: 0 -15px 0 0;` to `margin: 0;`
* | | | | | | | Merge branch 'fix_trigger_search' into 'master'Dmitriy Zaporozhets2015-03-191-23/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only trigger search if search string is present This is a follow up for !296 to prevent the search function from being executed while the query is nil. Problem was this: When the search is called, the search controller gets 2 requests. ``` {"action"=>"show", "controller"=>"search"} ``` and ``` {"utf8"=>"✓", "search"=>"proj", "project_id"=>"", "group_id"=>"", "snippets"=>"", "scope"=>"", "button"=>"", "action"=>"show", "controller"=>"search"} ``` Obviously it doesn't make sense to execute the search for the first request, since that one doesn't have a scope or a search string. Please review this carefully since this modifies the search and may break things i can't think of. @dzaporozhets While this fixes the root cause for the failing test, I think we should keep your fix in as a failsafe. What do you think of this? See merge request !302
| * | | | | | | | Only trigger actual search if a search string is presentHannes Rosenögger2015-03-191-23/+23
| |/ / / / / / /
* | | | | | | | Merge branch 'rake_backup' into 'master'Dmitriy Zaporozhets2015-03-192-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backup repo with tar instead of git bundle Fixes gitlab/gitlab-ee#246 See merge request !1723
| * | | | | | | | backup repo with tar instead of git bundleValery Sizov2015-03-192-2/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'fewer-constants-more-helpres' into 'master'Dmitriy Zaporozhets2015-03-194-8/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fewer Git constants, more Git helpers. See merge request !1727
| * | | | | | | | Fewer constants, more helpers.Douwe Maan2015-03-194-8/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-191-2/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'docs-spelling-error' into 'master'Hannes Rosenögger2015-03-191-2/+2
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spelling mistake in install docs Fixed spelling mistake of this. [ci skip] See merge request !404
| | * | | | | | | Changed tis to thisPhil Hughes2015-03-191-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-03-192-2/+2
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #8978 from sampi60/patch-1Robert Schilling2015-03-191-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix link to 'URL auto-linking' section in markdown help
| | * | | | | | | | Fix link to URL auto-linking section in markdown helpPiotr Sampławski2015-03-191-1/+1
| |/ / / / / / / /
| * | | | | | | | Merge pull request #8977 from rumpelsepp/rugmentsRobert Schilling2015-03-191-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Update rugments, fixes #8976
| | * | | | | | | Update rugments, fixes #8976Stefan Tatschner2015-03-191-1/+1
| |/ / / / / / /
* | | | | | | | Dont exit from brakeman rake taskDmitriy Zaporozhets2015-03-191-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-181-3/+3
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'remove-signin-flash' into 'master'Dmitriy Zaporozhets2015-03-191-3/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove success signin message by devise I find it really annoying every time I login into GitLab it shows me that I successfully signed in. But this makes no sense to me. I already see dashboard and dont see login screen. Its obvious I signed in successfully. Instead it just show annyoing message every time taking part of space on my screen. See merge request !401
| | * | | | | | | Remove signout flash message because it also makes no sense.remove-signin-flashDmitriy Zaporozhets2015-03-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You get redirected after signuout to gitlab.com and see this message on login page which makes no sense.
| | * | | | | | | Remove success signin message by deviseDmitriy Zaporozhets2015-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I find it really annoying every time I login into GitLab it shows me that I successfully signed in. But this makes no sense to me. I already see dashboard and dont see login screen. Its obvious I signed in successfully. Instead it just show annyoing message every time taking part of space on my screen.
* | | | | | | | | Merge branch 'show_test_settings_button' into 'master'Dmitriy Zaporozhets2015-03-191-2/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show test settings as disabled when service cannot be tested. See merge request !1725
| * | | | | | | | Show test settings as disabled when service cannot be tested.Marin Jankovski2015-03-181-2/+3
| |/ / / / / / /
* | | | | | | | Return compare code button to top of sidebarDmitriy Zaporozhets2015-03-181-3/+3
|/ / / / / / /
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-03-1816-90/+52
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'improve-ui' into 'master'Dmitriy Zaporozhets2015-03-1911-76/+43
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve UI * Improve group rename warning * Refactor select css. Make selects same width See merge request !400
| | * | | | | | | Update CHANGELOG with selectbox refactoringDmitriy Zaporozhets2015-03-181-0/+1
| | | | | | | | |
| | * | | | | | | Refactor select css. Make selects same widthDmitriy Zaporozhets2015-03-189-75/+41
| | | | | | | | |
| | * | | | | | | Improve group rename warningDmitriy Zaporozhets2015-03-181-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'improve-diffs' into 'master'Dmitriy Zaporozhets2015-03-196-14/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve diffs UI * replace big button with simple toggle for diff comments * replace diff stats button with link See merge request !399
| | * | | | | | | Add tooltip for comment toggle in diff. Add changelog item and fix testsDmitriy Zaporozhets2015-03-183-3/+4
| | | | | | | | |
| | * | | | | | | Add some space aroung diff stats blockDmitriy Zaporozhets2015-03-181-1/+1
| | | | | | | | |
| | * | | | | | | Replace show diff button with linkDmitriy Zaporozhets2015-03-181-5/+2
| | | | | | | | |
| | * | | | | | | Improve comment toggle button in diffDmitriy Zaporozhets2015-03-182-6/+3
| |/ / / / / / /
* | | | | | | | Fix project name overflow on dashboardDmitriy Zaporozhets2015-03-184-22/+13
|/ / / / / / /
* | | | | | | Fix link to project from forkDmitriy Zaporozhets2015-03-181-2/+2
|/ / / / / /
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-03-181-0/+16
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #8971 from jvanbaarsen/guard-bin-stubJeroen van Baarsen2015-03-181-0/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Added binstub for guard
| | * | | | | | Added binstub for guardJeroen van Baarsen2015-03-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | | | Move application setting to separate variable.Marin Jankovski2015-03-181-2/+4
| | | | | | | |
* | | | | | | | Merge branch 'more-nil-visibility-fixes' into 'master'Marin Jankovski2015-03-181-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil restricted visibility settings Return `true` from `non_restricted_level?` when the `restricted_visibility_levels` setting is nil. This addresses #2154. cc @sytse See merge request !1724
| * | | | | | | Handle nil restricted visibility settingsVinnie Okada2015-03-181-1/+5
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return `true` from `non_restricted_level?` when the `restricted_visibility_levels` setting is nil.