summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into admin-edit-identitiesadmin-edit-identitiesDmitriy Zaporozhets2015-06-2318-94/+175
|\
| * Its 7.13 time :)Dmitriy Zaporozhets2015-06-231-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'animation-sidebar' into 'master'Dmitriy Zaporozhets2015-06-234-18/+38
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Animation of Sidebar (video in here) Edited the CSS of header and sidebar; added a new div of gitlab-logo-container to the html to make things easier. The transition-duration is set to 0.3s and when the nav bar expands, it opens up over the text, essentially revealing hidden text. [animation-sidebar-2.mov](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b15996a256d6bed03a19c68549d116e4/animation-sidebar-2.mov) /cc @JobV @nicolas2 See merge request !849
| | * fixed the resizing icon issueanimation-sidebarDarby2015-06-221-2/+2
| | |
| | * Edited the CSS of header and sidebar; added a new class of logo-container to ↵Darby2015-06-194-16/+36
| | | | | | | | | | | | the html to make things easier
| * | Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets2015-06-237-56/+117
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Admin to filter users by 2FA status > ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png) Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414 See merge request !852
| | * | Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414Robert Speicher2015-06-222-38/+3
| | | |
| | * | Correct AddDefaultOtpRequiredForLoginValue migrationRobert Speicher2015-06-221-1/+3
| | | | | | | | | | | | | | | | | | | | Also MySQL complains when you change a field to be not null if any existing records already have a null value, so this updates those rows.
| | * | Make default value for otp_required_for_login false instead of nullRobert Speicher2015-06-204-8/+17
| | | |
| | * | Add CHANGELOG entry for 2FA status and filtering in admin areaRobert Speicher2015-06-191-0/+2
| | | |
| | * | Allow Admin to filter users by 2FA statusRobert Speicher2015-06-194-14/+97
| | | |
| * | | Merge branch 'fix-project-icon-links' into 'master'Dmitriy Zaporozhets2015-06-236-19/+19
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar tests to use banana_sample.gif Fixes tests that were broken in f5e0e5c0 due to the purge of `gitlab_logo.png`. See merge request !866
| | * | | Fix avatar tests to use banana_sample.gif since SVG is not supportedStan Hu2015-06-226-19/+19
| | | | |
* | | | | Set proper title when edit identity from admin areaDmitriy Zaporozhets2015-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix admin identities codeDmitriy Zaporozhets2015-06-232-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix code style issueDmitriy Zaporozhets2015-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Address review commentsDmitriy Zaporozhets2015-06-221-7/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' into admin-edit-identitiesDmitriy Zaporozhets2015-06-22225-1059/+1836
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/admin/users/show.html.haml
| * | | | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-2215-45/+45
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| | * | | Merge requests API returns closed for closed and merged for merged.revert-mr-state-namesDmitriy Zaporozhets2015-06-222-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Fix closed merge request scope at milestone pageDmitriy Zaporozhets2015-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Revert merge request states renamingDmitriy Zaporozhets2015-06-1914-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced: * "Accepted" with "Merged" * "Rejected" with "Closed" Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'nginx_defaulthost_documentation' into 'master'Dmitriy Zaporozhets2015-06-223-0/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close #178 Nginx conf default_host documentation This closes #178 We're just making it clear that some nginx installs such as by default on recent Ubuntu's, the /etc/nginx/sites-enabled/default file will conflict the listen line of the gitlab nginx conf's due to the default_server directive. changed installation.md to identify the issue to a user added notes to both nginx configs for gitlab and gitlab-ssl [ci-skip See merge request !225
| | * | | | fixed typoLuke Ashe-Browne2014-12-031-2/+2
| | | | | |
| | * | | | adding notes to gitlab nginx confLuke Ashe-Browne2014-12-033-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to make users aware that the nginx default config will conflict with the gitlab default_server conf file.
| * | | | | Merge branch 'see-full-size-avatar' into 'master'Dmitriy Zaporozhets2015-06-221-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link an users avatar to the fullsize version When we want to see the fullsize avatar of a user we can click the avatar on the profile page and the fullsize version will be opened in a new window/tab. See merge request !415
| | * | | | | When we want to see the fullsize avatar of a user we can click the avatar on ↵Sander Boom2015-03-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the profile page and the fullsize version will be opened in a new window/tab.
| * | | | | | Merge branch 'remove_unused_except' into 'master'Dmitriy Zaporozhets2015-06-221-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | projects doesn't seem to be a valid action in this controller Hi, This is just a tiny change. Let me know if I'm doing it wrong... Eaden See merge request !696
| | * | | | | | projects doesn't seem to be a valid action in this controllerEaden2015-05-161-2/+2
| | | | | | | |
| * | | | | | | Merge branch 'rs-rspec3' into 'master'Dmitriy Zaporozhets2015-06-22105-556/+662
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RSpec3 Upgrades rspec to 3.3.0, we're now up-to-date! :tada: See merge request !831
| | * | | | | | | Fix Gitlab::OAuth::User specrs-rspec3Robert Speicher2015-06-221-37/+48
| | | | | | | | |
| | * | | | | | | Add sleep call before yield in allowing_for_delayRobert Speicher2015-06-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to give pending AJAX requests time to complete before we navigate away, for example.
| | * | | | | | | Change `to_not` calls to `not_to`Robert Speicher2015-06-2213-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both work, but now we're consistent across the entire app.
| | * | | | | | | Fix `raise_error` without an argument deprecation warningsRobert Speicher2015-06-228-16/+16
| | | | | | | | |
| | * | | | | | | Remove junk from db_cleaner spec support fileRobert Speicher2015-06-221-29/+0
| | | | | | | | |
| | * | | | | | | Move CapybaraHelpers to its own support fileRobert Speicher2015-06-222-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case we end up wanting to use it in Spinach as well.
| | * | | | | | | Bump pg gem to 0.18.2Robert Speicher2015-06-221-1/+1
| | | | | | | | |
| | * | | | | | | Bump database_cleaner to ~> 1.4.0Robert Speicher2015-06-222-6/+3
| | | | | | | | |
| | * | | | | | | Fix GitPushService specRobert Speicher2015-06-221-4/+6
| | | | | | | | |
| | * | | | | | | Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-229-21/+16
| | | | | | | | |
| | * | | | | | | Use to_reference for issue and merge request mentionable specsRobert Speicher2015-06-222-4/+4
| | | | | | | | |
| | * | | | | | | Bump rspec to 3.3.0Robert Speicher2015-06-222-30/+33
| | | | | | | | |
| | * | | | | | | Update spec/features/security specsRobert Speicher2015-06-222-43/+26
| | | | | | | | |
| | * | | | | | | Update email_spec gemRobert Speicher2015-06-224-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes spec/mailers/notify_spec Also only require email_spec in the one place it's used
| | * | | | | | | Update mock and stub syntax for specsRobert Speicher2015-06-2249-220/+283
| | | | | | | | |
| | * | | | | | | Update and simplify Import controller specsRobert Speicher2015-06-226-36/+75
| | | | | | | | |
| | * | | | | | | Fix include_module matcherRobert Speicher2015-06-221-1/+5
| | | | | | | | |
| | * | | | | | | Bump poltergeist to 1.6.0Robert Speicher2015-06-222-4/+6
| | | | | | | | |
| | * | | | | | | Fix features syntaxRobert Speicher2015-06-2213-52/+84
| | | | | | | | |
| | * | | | | | | Upgrade to newer version of CapybaraJeroen van Baarsen2015-06-222-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
View Lorry Controller Status