Commits · 4227f6ed145bdc884cf92b0c29714abc9331d702 · iv / gitlab-ce

16 Dec, 2013 4 commits
- Merge pull request #5856 from nishigori/fix-typo · 4227f6ed
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Fix messages typo
```
  4227f6ed
- Merge pull request #5848 from bke-drewb/feature/time_ago_tooltips · 3f709e0a
  Dmitriy Zaporozhets authored Dec 16, 2013
```
Add time ago tooltips to show actual date/time
```
  3f709e0a
- Merge pull request #5681 from chopmann/patch-2 · 3221dc53
  Dmitriy Zaporozhets authored Dec 16, 2013
```
FIX: Browser back button breaks "Loading..." visual
```
  3221dc53
- Fix messages typo · e78b90ab
  Takuya Nishigori authored Dec 16, 2013
  
  e78b90ab
14 Dec, 2013 3 commits

Add time ago tooltips to show actual date/time · fa817dff

Drew Blessing authored Dec 13, 2013

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Clean up admin dashboad tooltips

Add helper method

change to use app helper

Modify tooltips to use new helper

Convert remaining times

Adjust one tooltip

fa817dff

Remove colored gem from upgrader script. pt2 · d476ac7d
Dmitriy Zaporozhets authored Dec 14, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d476ac7d
Remove colored gem from upgrader script · 5e73a3b1
Dmitriy Zaporozhets authored Dec 14, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
5e73a3b1

13 Dec, 2013 9 commits
- Merge branch 'feature/minor_update_script' of /home/git/repositories/gitlab/gitlabhq · ee53b739
  Dmitriy Zaporozhets authored Dec 13, 2013
  
  ee53b739
- Use 'ruby script/upgrade.rb -y' instead of ENV · c638ef33
  Dmitriy Zaporozhets authored Dec 13, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c638ef33
- Allow non-interactive run of upgrade script. ruby script/upgrade.rb FORCE=yes · 51c9f0fd
  Dmitriy Zaporozhets authored Dec 13, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  51c9f0fd
- Merge branch 'fix/system_hooks_ui' of /home/git/repositories/gitlab/gitlabhq · b1eb3d46
  Dmitriy Zaporozhets authored Dec 13, 2013
  
  b1eb3d46
- Create branch for tag · 99830bb6
  Dmitriy Zaporozhets authored Dec 13, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  99830bb6
- Minor version upgrader · 440f3f38
  Dmitriy Zaporozhets authored Dec 13, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  440f3f38
- Show MR accept info only if merge request is open · 2ca4e708
  Dmitriy Zaporozhets authored Dec 13, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2ca4e708
- Fix header case · 4ec8eecb
  Dmitriy Zaporozhets authored Dec 13, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4ec8eecb
- Fix broken UI for admin system hooks · a7a344f0
  Dmitriy Zaporozhets authored Dec 13, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  a7a344f0
12 Dec, 2013 16 commits
- Add authenticity_token: true to multipart forms · 9b7b27ce
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Rails 4 does not generate token by default
It fixes bug when you get to sign-in page after trying to upload image
with comment
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9b7b27ce
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq · c959143e
  Dmitriy Zaporozhets authored Dec 12, 2013
  
  c959143e
- Add support for relative url to GitLab.GfmAutoComplete.Emoji.assetBase · 32e18169
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  32e18169
- Merge branch 'fog_expiration_date' of /home/git/repositories/gitlab/gitlabhq · 144a25ef
  Dmitriy Zaporozhets authored Dec 12, 2013
  
  144a25ef
- Fix emojii autocomplete · 29bfe345
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  29bfe345
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · f381308c
  Dmitriy Zaporozhets authored Dec 12, 2013
  
  f381308c
- Merge branch 'bug/mr_duplicate_iids' of /home/git/repositories/gitlab/gitlabhq · 03e517e0
  Dmitriy Zaporozhets authored Dec 12, 2013
  
  03e517e0
- Fix test · 8c5aa5e3
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  8c5aa5e3
- Merge pull request #5827 from Razer6/remove_rails4_travis · f1be1374
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Remove rails4 branch in travis configuration 
```
  f1be1374
- Allow close of broken MR · cb599a09
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  cb599a09
- Use MR#source_project_path method instead of merge_request.source_project.path_with_namespace · 432018f8
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  432018f8
- Proper erro message for MR when fork removed · 7901d143
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  7901d143
- Remove rails4 branch in travis configuration since this branch is already merged · 5675d343
  Robert Schilling authored Dec 12, 2013
  
  5675d343
- Add new methods to MR to check if source or target branch exists · 6c345997
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  6c345997
- Render valid message when MR source or target branch was removed · 5a4386a4
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  5a4386a4
- do not remove merge requests when fork project destroyed · 405694a5
  Dmitriy Zaporozhets authored Dec 12, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  405694a5
11 Dec, 2013 8 commits
- Merge branch 'bug/at_disappear' of /home/git/repositories/gitlab/gitlabhq · 7bb2a536
  Dmitriy Zaporozhets authored Dec 11, 2013
  
  7bb2a536
- Reduce Fog expiration period to 17 years · 7cb75aeb
  Jacob Vosmaer authored Dec 11, 2013
  
  7cb75aeb
- Expire fog links after 34 years · 3e57d88e
  Jacob Vosmaer authored Dec 11, 2013
  
  3e57d88e
- Fix disappearing @ when mention user · 38fc5dc2
  Dmitriy Zaporozhets authored Dec 11, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  38fc5dc2
- Merge branch 'improve/avatar_size' of /home/git/repositories/gitlab/gitlabhq · 0456c666
  Dmitriy Zaporozhets authored Dec 11, 2013
  
  0456c666
- Add DELETE to api cors · 445f31c6
  Dmitriy Zaporozhets authored Dec 11, 2013
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  445f31c6
- Merge pull request #5759 from bke-drewb/issue-5496 · adf55958
  Dmitriy Zaporozhets authored Dec 11, 2013
```
Add cache expiry on avatar creation/removal
```
  adf55958
- Expire event cache on avatar creation/removal · c26d392b
  Drew Blessing authored Dec 11, 2013
  
  c26d392b