summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Account for RootController for dashboard navigation and Dispatch JSRobert Speicher2015-06-132-2/+2
| | | | | | | | | |
| * | | | | | | | | Add RootControllerRobert Speicher2015-06-135-4/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This controller is now the target for `root_url`. It sub-classes DashboardController so we can render the old default without a redirect if the user hasn't customized their dashboard location.
| * | | | | | | | | Add `dashboard` attribute to User modelRobert Speicher2015-06-136-3/+22
| | | | | | | | | |
| * | | | | | | | | Update markup/styling for syntax highlight theme preferenceRobert Speicher2015-06-132-9/+7
| | | | | | | | | |
| * | | | | | | | | Simplify the javascript behavior for Preference updatingRobert Speicher2015-06-134-14/+18
| | | | | | | | | |
| * | | | | | | | | Fix a few remaining references to the old Theme names/IDsRobert Speicher2015-06-133-8/+9
| | | | | | | | | |
| * | | | | | | | | Remove js handler from Profiles#updateRobert Speicher2015-06-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was only used for the appearance live updating, which is now handled by Profiles::Preferences#update
| * | | | | | | | | Add PreferencesHelper moduleRobert Speicher2015-06-138-55/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidates the helpers related to user preferences. Renames `app_theme` to `user_application_theme` to better explain what it is.
| * | | | | | | | | Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-1310-97/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we can simply loop through all themes, among other things. This also removes the `dark_theme` / `light_theme` classes and the `theme_type` helper, since they weren't used anywhere.
| * | | | | | | | | Consolidate theme stylesheets into oneRobert Speicher2015-06-1311-107/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since they're all defined by a mixin, it didn't provide any benefit to have them in separate files. This also adds variables defining the basic color of each theme so we can re-use them in the previews.
| * | | | | | | | | Move the "Design" templates and logic to PreferencesRobert Speicher2015-06-1311-105/+112
| | | | | | | | | |
| * | | | | | | | | Allow login_as helper to accept a User objectRobert Speicher2015-06-131-4/+20
| | | | | | | | | |
| * | | | | | | | | Add Profiles::PreferencesControllerRobert Speicher2015-06-1311-15/+127
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceMarin Jankovski2015-06-158-18/+41
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'remove-visibility-icons' into 'master'Douwe Maan2015-06-153-6/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove visibility icon from projects list on dashboard and group page ## Why? Because * visibility level show on project page anyway * it does not have much value. Main purpose of project list on dashboard is navigation. Avatar + project name helps this goal. Visibility icon have no effect here * it makes UI worse because it brings separation between project avatar and name * without visibility icon we have more space for project name. Especially important for laptops ## Screenshot ![Screenshot_2015-06-12_18.17.20](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0e572388e9a337c5a535813911d08c89/Screenshot_2015-06-12_18.17.20.png) P.S. Merge when 7-12-stable is created See merge request !806
| | * | | | | | | | | | Remove visibility icon from projects list on dashboard and group pageremove-visibility-iconsDmitriy Zaporozhets2015-06-123-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | | | | Merge branch 'fix-post-receive-external-tracker' into 'master'Douwe Maan2015-06-155-11/+37
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix post-receive errors on a push when an external issue tracker is configured ### What does this MR do? This MR improves upon !766, fixing errors upon a git push that occur only when an external issue tracker (not JIRA) is used. This MR takes into account that external issue trackers, such as JIRA, may close issues. Disabling the processing of post-receive commits when an external issue tracker is configured seems like the wrong behavior. ### Why was this MR needed? When a user adds an issue reference, the refactoring in 8f8a8ab and a6defd157 caused `project.get_issue` to be called, causing `ExternalIssue` to be returned when an external issue tracker was configured. This object does not have a `close` method, as needed in `CloseService`. Nor does it make sense to associate a `SystemNote` with this object. GitLab EE uses a [special case for JIRA](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/services/git_push_service.rb#L87). I would recommend moving this logic into `CloseService` too. ### What are the relevant issue numbers? * Closes #1700 * Closes #1720 See merge request !804
| | * | | | | | | | | | | Fix post-receive errors on a push when an external issue tracker is configuredStan Hu2015-06-125-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1700 Closes #1720
| * | | | | | | | | | | | Merge branch 'update-irker-home' into 'master'Robert Schilling2015-06-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Irker home page [ci skip] Closes #1713 See merge request !812
| | * | | | | | | | | | | Update Irker home pageStan Hu2015-06-141-1/+1
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #1713
* | | | | | | | | | | | Merge branch 'remove_all_projects_button' into 'master'Douwe Maan2015-06-151-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove button to all projects on Trending Projects page. Fixes #2001. See merge request !1860
| * | | | | | | | | | | Remove button to all projects on Trending Projects page.Nicolas2015-06-141-3/+0
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2001.
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1418-77/+75
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs-issue-1432' into 'master'Dmitriy Zaporozhets2015-06-142-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Redcarpet to 3.3.0 Fixes #1432 See merge request !809
| | * | | | | | | | | | | Update Redcarpet to 3.3.0rs-issue-1432Robert Speicher2015-06-132-3/+3
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #1432
| * | | | | | | | | | | Merge branch 'rs-expect-syntax-specs' into 'master'Dmitriy Zaporozhets2015-06-1416-74/+72
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare specs for RSpec 3 See merge request !811
| | * | | | | | | | | | Use `page.all` and `page.within` in specsrs-expect-syntax-specsRobert Speicher2015-06-134-20/+20
| | | | | | | | | | | |
| | * | | | | | | | | | Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher2015-06-1313-48/+46
| | | | | | | | | | | |
| | * | | | | | | | | | Change `foo.should_not` syntax to `expect(foo).not_to` in specsRobert Speicher2015-06-134-6/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #9340 from jvanbaarsen/update-noteableDmitriy Zaporozhets2015-06-143-2/+6
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Update noteable after a new note is added
| * | | | | | | | | | Update noteable after a new note is addedJeroen van Baarsen2015-06-053-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It makes sure that whenever a new note is added to an noteable item, the updated_at of that item is also updated. **Why is this needed?** At this moment when you post a comment on an issue or add a label to an issue, the updated_at is not changed. Because of this the filtering for least recently updated is not really useful (since it only takes in account the original text from the noteable). Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | | | | | | | Merge branch 'rs-issue-1798' into 'master'Dmitriy Zaporozhets2015-06-133-12/+12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure `session_expire_delay` field exists before accessing it Closes #1798 See merge request !808
| * | | | | | | | | | | Ensure `session_expire_delay` field exists before accessing itrs-issue-1798Robert Speicher2015-06-133-12/+12
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1798
* | | | | | | | | | | Merge branch 'regex-anchor-docs' into 'master'Sytse Sijbrandij2015-06-121-0/+30
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add info about regex anchors to shell command docs. Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-ee/issues/263. See merge request !805
| * | | | | | | | | | | Add info about regex anchors to shell command docs.Douwe Maan2015-06-121-0/+30
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'feature-session-expire-seconds-ui' into 'master'Douwe Maan2015-06-1210-4/+30
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add session expiration delay configuration through UI application Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting) Answers the following suggestions: * http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable * http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle See merge request !774
| * | | | | | | | | | session_expire_seconds => session_expire_delaythemaze752015-06-1010-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delay is in seconds more legible code in session_store Added `GitLab restart required` help block to session_expire_delay
| * | | | | | | | | | Add session expiration delay configuration through UI applicationEric Maziade2015-06-0510-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings
* | | | | | | | | | | Merge branch 'update-guides-7.12' into 'master'Jacob Vosmaer2015-06-122-10/+144
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 7.12 update guides See merge request !1858
| * | | | | | | | | | Move mention of git 2.1.2 to intro paragraphJacob Vosmaer2015-06-121-5/+4
| | | | | | | | | | |
| * | | | | | | | | | Add 7.12 update guidesJacob Vosmaer2015-06-122-10/+145
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix_typo_account_page' into 'master'Douwe Maan2015-06-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo on account page. @douwe Thanks for reviewing this small fix. See merge request !1854
| * | | | | | | | | | | Fix typo on account page.Nicolas2015-06-121-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'update-install-docs' into 'master'Marin Jankovski2015-06-121-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update install docs for 7.12 See merge request !1857
| * | | | | | | | | | | New source installs should use 7-12-stableJacob Vosmaer2015-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though the 7-12-stable branch does not exist yet.
| * | | | | | | | | | | Install git 2.4.3Jacob Vosmaer2015-06-121-2/+2
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.1.2 does not protect against pushes trying the '.Git/config' attack (CVE-2014-9390). Going to 2.4.3 is perhaps a big jump but why not use the latest? (Famous last words.)
* | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-1270-831/+831
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rs-expect-syntax-features' into 'master'Dmitriy Zaporozhets2015-06-1270-831/+831
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepare feature steps for RSpec 3 See merge request !803
| | * | | | | | | | | | Call `page.all` instead of `all` in feature stepsRobert Speicher2015-06-1210-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's a naming conflict between Capybara and rspec-matchers which both define the `all` method. See https://github.com/jnicklas/capybara/issues/1396
| | * | | | | | | | | | Change `within` to `page.within` in feature stepsRobert Speicher2015-06-1234-159/+159
| | | | | | | | | | | |
View Lorry Controller Status