- 05 Jul, 2016 20 commits
-
-
Jacob Schatz authored
Fixed avatar alignment in new MR view ## What does this MR do? Fixes the alignment of the avatar in the new MR compare view ## Screenshots (if relevant)  See merge request !5095
-
Phil Hughes authored
-
Robert Speicher authored
Upgrade Doorkeeper from 3.1.0 to 4.0.0. Includes Rails 5 support and various bug fixes. Working toward #14286. Changelog: https://github.com/doorkeeper-gem/doorkeeper/blob/master/NEWS.md#400 See merge request !5055
-
Dmitriy Zaporozhets authored
Remove current user link to the profile from sidebar Because user avatar and link to the profile are duplicated in the header now Related to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4939 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18544 cc @iamphill @jschatz1 See merge request !5077
-
Dmitriy Zaporozhets authored
Signed-off-by:Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: -
Dmitriy Zaporozhets authored
Signed-off-by: -
Dmitriy Zaporozhets authored
Add profile settings link to header user dropdown It allows you to get to profile settings right from avatar without triggering sidebar Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5077#note_12878162 See merge request !5090
-
Dmitriy Zaporozhets authored
Signed-off-by: -
Yorick Peterse authored
Instrument cache fetch hit and misses See merge request !4993
-
Achilleas Pipinellis authored
Fix wording around NGINX Shibboleth setup  __________  See merge request !5034
-
Paco Guzman authored
-
Paco Guzman authored
-
Achilleas Pipinellis authored
Add missing privileges to MySQL database Closes gitlab-org/gitlab-ce#19321 See merge request !5079
-
Yorick Peterse authored
Add index on both Award Emoji user and name See merge request !5061
-
Achilleas Pipinellis authored
[ci skip]
-
Rémy Coutable authored
Move global ci entries handling from legacy to new config ## What does this MR do? This MR moves responsibility of handling global CI config entries (like `image`, `services`), from legacy `GitlabCiYamlProcessor` to new CI Config ## Why was this MR needed? This is the next iteration of CI configuration refactoring ## What are the relevant issue numbers? #15060 ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) See merge request !4820
-
Z.J. van de Weg authored
-
Stan Hu authored
Assert against `ActionMailer::Base.deliveries` relatively - Closes #19496 - Fixes `master` build See merge request !5082
-
Timothy Andrew authored
- Look for a `change` in its size rather than asserting against an actual size. - This previously failed because another spec had an email in `ActionMailer::Base.deliveries`, which failed this `be_nil` assertion.
-
- 04 Jul, 2016 20 commits
-
-
Achilleas Pipinellis authored
Add troubleshooting section for SMTP settings See merge request !5046
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Added user avatar to header ## What does this MR do? Adds the users avatar to the header with a dropdown for profile & sign out. ## What are the relevant issue numbers? Closes #18543 ## Screenshots (if relevant)   See merge request !4939
-
Dmitriy Zaporozhets authored
Handle custom Git hook result in GitLab UI ## What does this MR do? This MR fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/19190 It allows to show messages from git custom hooks ## Screenshots (if relevant)  See merge request !5073
-
Valery Sizov authored
-
Achilleas Pipinellis authored
Fix dead links in the docs (Jun 2016) ## What does this MR do? Fix dead links in the docs found as of Jun 2016. ## Are there points in the code the reviewer needs to double check? n/a ## Why was this MR needed? This MR must improve UX on docs.gitlab.com. ## What are the relevant issue numbers? Closes #19156 ## Does this MR meet the acceptance criteria? - No [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) updated - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4921
-
Grzegorz Bizon authored
-
Robert Speicher authored
Upgrade rspec-rails from 3.4.2 to 3.5.0. Also upgrade its dependencies. Includes Rails 5 support. Working toward #14286 Changelogs: http://rspec.info/blog/2016/07/rspec-3-5-has-been-released/ See merge request !5051
-
Hannes Rosenögger authored
Update README.md - SSH password can be changed with `ssh-keygen -p` SSH password can be changed with `ssh-keygen -p` See merge request !4152
-
Rémy Coutable authored
Save artifacts sizes ## What does this MR do? Introduce ci_builds.artifacts_size as an integer, so that it's easier to access than reading from the file again. ## What are the relevant issue numbers? Closes #18869 See merge request !4964
-
Lin Jen-Shin authored
Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964/diffs#note_12867416 Guidelines: https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/testing.md#general-guidelines > Use `context` to test branching logic.
-
Lin Jen-Shin authored
Feedback from: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4964#note_12867273
-
Rémy Coutable authored
Update spring to 1.7.2 to fix hanging rails console ## What does this MR do? Update spring to 1.7.2. ## Why was this MR needed? This fixes hanging rails console issue. ## Related Fixes https://gitlab.com/gitlab-org/gitlab-development-kit/issues/127 ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5066
-
Dmitriy Zaporozhets authored
More descriptive message for git hooks and file locks ## What does this MR do? Most of the benefits will be in GitLab EE because we have git hooks there (push rules) and file lock features. Instead of showing "Git operation was rejected by #{hook_name} hook" the actual problem description will be shown. Also you will see a clear message when you edit locked file. ## Why was this MR needed? Because we don't want to confuse our users ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ee/issues/713 See merge request !5067 -
Valery Sizov authored
-
Kamil Trzcinski authored
-
Lin Jen-Shin authored
* upstream/master: (175 commits) Document Repository#keep_around Don't garbage collect commits that have related DB records like comments Update CHANGELOG Update RedCloth to 4.3.2 for CVE-2012-6684 Fix typo in Merge Requests API documentation Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiq Enable Style/EmptyLines cop, remove redundant ones Update CHANGELOG Cache results from jQuery selectors to retrieve namespace name Fix import button when import fail due the namespace already been taken Fix snippets comments not displayed Fix emoji paths in relative root configurations Exclude requesters from Project#members, Group#members and User#members Upgrade Thin from 1.6.1 to 1.7.0. Many squashed commits Cache autocomplete results Upgrade Sidekiq from 4.1.2 to 4.1.4. Upgrade seed-fu from 2.3.5 to 2.3.6 use has_many relationship with events Support creating a todo on issuables via API ...
-
Lin Jen-Shin authored
-
-
-
